# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1281492489 -7200
# Node ID 86a0cec24d06530ad1dc2c252d8f1cf6e6d7ff0f
# Parent  2864788b37cf41b6dcca282170a1e565ca1598e8# Parent  da2e11c54daa2a63de8ca4144e6c885bf9f0e910
Automated merge with http://hoho.dyndns.org/hg/portage

diff -r 2864788b37cf -r 86a0cec24d06 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,2 @@
+^layman/
+\.orig$
diff -r 2864788b37cf -r 86a0cec24d06 app-admin/jailkit/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/jailkit/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,6 @@
+AUX jailkit 277 RMD160 3008e6f78a67af2eb318988c034f58197c54abc1 SHA1 a365679a5c9f80db63c3737f979c5b1c99d8f5d4 SHA256 58a7fcdaae6b1706d0183c826b4ff5856c99f24ba41eaf7956b42ff8e35388a7
+AUX jailkit-2.11-ldflags.patch 1885 RMD160 4a1b7bbabb29f9852e9988945ba1047b33443dad SHA1 afbf0aa87f43f881aafc4ee9f6c54c606063d1ad SHA256 a4c32f8ede109b5bdf8b40c32fe18d7c60fef9da9aeb55f86ffae1db0b4bd1a7
+AUX jailkit-2.11-noshells.patch 514 RMD160 5583bcdfb602d6f682db2e125bde2507fd2ebb1a SHA1 4c6c722093ae6d7616269ff48ed402db06533b57 SHA256 1dac48a765603f506e1cc0a0d876fb32ed5121cb64cf12dd5ffec31136880ae3
+AUX jailkit-2.11-pyc.patch 354 RMD160 d0a548409b74ed94fcb9537850ebba96954917b3 SHA1 c55581b9216680aeec54d5e12da4f988052c4777 SHA256 7ec99db35b9483446601495d2ae481df52611e6f52926d3cd18ffbd569a5fd70
+DIST jailkit-2.11.tar.bz2 110684 RMD160 2d04fa253fc4b419c05137e4618ef18c51c88a19 SHA1 6344b79a2093699115d22668a08e052e75f655e3 SHA256 e774de4ebfa261c82c6fc9e6294a5b5f88d871d26ba0ca4f6d7ccc7308f17de2
+EBUILD jailkit-2.11.ebuild 887 RMD160 2e457e785e5047d654d90ecdf0b089867e87ce4e SHA1 6448166e336586f6e4e3adcca23920dd98d2afe4 SHA256 0d2583c4098860c9c3fcb469d17b918ee1c3b85f84db8a3214cfe1e37ba2a75f
diff -r 2864788b37cf -r 86a0cec24d06 app-admin/jailkit/files/jailkit
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/jailkit/files/jailkit	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,18 @@
+#!/sbin/runscript
+
+JK_SOCKETD="/usr/sbin/jk_socketd"
+
+depend() {
+	need logger
+}
+
+start() {
+	ebegin "Starting jk_socketd"
+	start-stop-daemon --start --exec ${JK_SOCKETD}
+	eend $?
+}
+stop() {
+	ebegin "Stopping jk_socketd"
+	start-stop-daemon --stop --exec ${JK_SOCKETD}
+	eend $?
+}
diff -r 2864788b37cf -r 86a0cec24d06 app-admin/jailkit/files/jailkit-2.11-ldflags.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/jailkit/files/jailkit-2.11-ldflags.patch	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index e77ea24..1814f2a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,7 +142,7 @@ AC_CHECK_FUNCS(
+ 	[cap_get_proc],,
+ 	AC_CHECK_LIB([cap], [cap_get_proc],
+ 		AC_DEFINE(HAVE_CAP_GET_PROC)
+-		LDFLAGS="$LDLAGS -lcap",
++		LIBS="$LIBS -lcap",
+ 	)
+ )
+ 
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 49449b6..f55150f 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -67,22 +67,22 @@ OBJS = $(SRCS:.c=.o)
+ all: ${BINARIES}
+ 
+ jk_chrootlaunch: jk_chrootlaunch.o jk_lib.o utils.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_chrootlaunch.o jk_lib.o utils.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_chrootlaunch.o jk_lib.o utils.o $(LIBS)
+ 
+ jk_socketd: jk_socketd.o jk_lib.o utils.o iniparser.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_socketd.o jk_lib.o utils.o iniparser.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_socketd.o jk_lib.o utils.o iniparser.o $(LIBS)
+ 
+ jk_lsh: jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o $(LIBS)
+ 
+ jk_chrootsh: jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o $(LIBS)
+ 
+ jk_uchroot: jk_uchroot.o iniparser.o jk_lib.o utils.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_uchroot.o iniparser.o jk_lib.o utils.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_uchroot.o iniparser.o jk_lib.o utils.o $(LIBS)
+ 
+ jk_procmailwrapper: jk_procmailwrapper.o jk_lib.o utils.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_procmailwrapper.o jk_lib.o utils.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_procmailwrapper.o jk_lib.o utils.o $(LIBS)
+ 
+ clean:
+ 	rm -f ${BINARIES}
diff -r 2864788b37cf -r 86a0cec24d06 app-admin/jailkit/files/jailkit-2.11-noshells.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/jailkit/files/jailkit-2.11-noshells.patch	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,17 @@
+diff --git a/Makefile.in b/Makefile.in
+index 69a9229..eccdbf4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -69,12 +69,6 @@ install:
+ 	@cd man/ && $(MAKE) install
+ 	# test if the jk_chrootsh is already in /etc/shells
+ 	# this previously had @echo but that fails on FreeBSD
+-	if test -w /etc/shells; then \
+-		if ! grep ${prefix}/sbin/jk_chrootsh /etc/shells ; then \
+-			echo "appending ${prefix}/sbin/jk_chroots to /etc/shells";\
+-			echo ${prefix}/sbin/jk_chrootsh >> /etc/shells ;\
+-		fi \
+-	fi
+ 
+ 
+ uninstall:
diff -r 2864788b37cf -r 86a0cec24d06 app-admin/jailkit/files/jailkit-2.11-pyc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/jailkit/files/jailkit-2.11-pyc.patch	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,12 @@
+diff --git a/py/Makefile.in b/py/Makefile.in
+index 925cd12..7ffb1a2 100644
+--- a/py/Makefile.in
++++ b/py/Makefile.in
+@@ -67,7 +67,6 @@ install: all
+ 	done
+ 	${INSTALL} -d -m 755 ${DESTDIR}${PYLIBDIR}
+ 	${INSTALL} -m 0644 jk_lib.py ${DESTDIR}${PYLIBDIR}/
+-	${INSTALL} -m 0644 jk_lib.pyc ${DESTDIR}${PYLIBDIR}/
+ 
+ uninstall:
+ 	for file in ${PY_BINS}; do \
diff -r 2864788b37cf -r 86a0cec24d06 app-admin/jailkit/jailkit-2.11.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/jailkit/jailkit-2.11.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Allows you to easily put programs and users in a chrooted environment"
+HOMEPAGE="http://olivier.sessink.nl/jailkit/"
+SRC_URI="http://olivier.sessink.nl/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-ldflags.patch" \
+		"${FILESDIR}/${P}-pyc.patch" \
+		"${FILESDIR}/${P}-noshells.patch"
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	doinitd "${FILESDIR}/jailkit" ||  die "doinit install failed"
+}
+
+pkg_postinst() {
+	ebegin "Updating /etc/shells"
+	{ grep -v "^/usr/sbin/jk_chrootsh$" "${ROOT}"etc/shells; echo "/usr/sbin/jk_chrootsh"; } > "${T}"/shells
+	mv -f "${T}"/shells "${ROOT}"etc/shells
+	eend $?
+}
diff -r 2864788b37cf -r 86a0cec24d06 app-crypt/truecrypt/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-crypt/truecrypt/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,8 @@
+AUX truecrypt-6.1-64bit.patch 664 RMD160 0f6b1ef68746290670a805b9483de5625041e3b6 SHA1 a9290da440cdc9c42caec10c4fc9eeedb8b2a3a1 SHA256 f41bc0c1cbd9a7c64b4142f839e362e787de31abd5623fce75c2d734189e82f5
+AUX truecrypt-6.1-bool.patch 883 RMD160 1b9b91f239bd504371f73a96d04fea5a33ca2f62 SHA1 87c470f2f338ef6234846b3ed3606d37416a9ace SHA256 58f364a135d124210bb4f65a5d38a7b59efa3db4afaaf6159d4344ca798c881a
+AUX truecrypt-6.1-external-wx.patch 391 RMD160 742f8d7a239211738d30b0da6efdd790e88e34f2 SHA1 8d3cf5bcbc7d55ef74c3b52d34dbd370584b69fe SHA256 668e4460f0daeb1e896b7b6d6673b741db12d82e04eb503a1e2c7924ed819331
+DIST pkcs11.h 9578 RMD160 038002de5e6ed90174051bc5f96a12c51e5f87f0 SHA1 4a87fd021aed6304bccf3987107812b9d701dfe9 SHA256 1563d877b6f8868b8eb8687358162bfb7f868104ed694beb35ae1c5cf1a58b9b
+DIST pkcs11f.h 29258 RMD160 c47b5818f84e42aa9d11dfe250a6da2cca14cb77 SHA1 853ad63da8961ac309bac902d270d3497a8e3356 SHA256 5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8
+DIST pkcs11t.h 70934 RMD160 da30e5792b7b56b4f3651f65f548c23e1ac96eac SHA1 1909623adf647589c7d7e8f49672936c8e03d500 SHA256 8ce68616304684f92a7e267bcc8f486441e92a5cbdfcfd97e69ac9a0b436fb7b
+DIST truecrypt-6.1a.tar.gz 1773482 RMD160 d3753af8fee062e4d4c554145cddc9590b1d9ccf SHA1 f2fb1c8cd18b4452529edb53479418a5c1460a58 SHA256 a2bb8273edcb3c3d10d9819daac853f940033deb1f9726986311356bd5b88c4a
+EBUILD truecrypt-6.1a.ebuild 2724 RMD160 478e4476ea376050310d8a0d8b32502550f402cb SHA1 d0898cd36a0d45247c6347b8881ee34f6024aeb5 SHA256 5951a886dc2237cdf30b76aadc4adf2b17454bd6b8b48d26d2cc33e953aed422
diff -r 2864788b37cf -r 86a0cec24d06 app-crypt/truecrypt/files/truecrypt-6.1-64bit.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-crypt/truecrypt/files/truecrypt-6.1-64bit.patch	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,15 @@
+diff -urNp truecrypt-6.1-source.orig/Makefile truecrypt-6.1-source/Makefile
+--- truecrypt-6.1-source.orig/Makefile	2008-11-11 12:43:29.000000000 +0300
++++ truecrypt-6.1-source/Makefile	2008-11-11 13:34:37.000000000 +0300
+@@ -50,7 +50,11 @@ C_CXX_FLAGS += -I$(PKCS11_INC)
+ endif
+ 
+ C_CXX_FLAGS += -DBOOL=int -DFALSE=0 -DTRUE=1
++ifeq "$(origin USE64BIT)" "command line"
++C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long'  # Tested in PlatformTest
++else
+ C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long long'  # Tested in PlatformTest
++endif
+ 
+ export LFLAGS :=
+ export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig
diff -r 2864788b37cf -r 86a0cec24d06 app-crypt/truecrypt/files/truecrypt-6.1-bool.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-crypt/truecrypt/files/truecrypt-6.1-bool.patch	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,25 @@
+diff -urNp truecrypt-6.1-source.orig/Common/Crypto.h truecrypt-6.1-source/Common/Crypto.h
+--- truecrypt-6.1-source.orig/Common/Crypto.h	2008-11-11 23:12:53.000000000 +0300
++++ truecrypt-6.1-source/Common/Crypto.h	2008-11-11 23:14:33.000000000 +0300
+@@ -29,6 +29,10 @@
+ 
+ #include "Tcdefs.h"
+ 
++#ifndef BOOL
++#define BOOL BOOL1
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff -urNp truecrypt-6.1-source.orig/Makefile truecrypt-6.1-source/Makefile
+--- truecrypt-6.1-source.orig/Makefile	2008-11-11 23:12:53.000000000 +0300
++++ truecrypt-6.1-source/Makefile	2008-11-11 23:13:32.000000000 +0300
+@@ -50,6 +50,7 @@ C_CXX_FLAGS += -I$(PKCS11_INC)
+ endif
+ 
+ C_CXX_FLAGS += -DBOOL=int -DFALSE=0 -DTRUE=1
++C_CXX_FLAGS += -DBOOL1=int
+ ifeq "$(origin USE64BIT)" "command line"
+ C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long'  # Tested in PlatformTest
+ else
diff -r 2864788b37cf -r 86a0cec24d06 app-crypt/truecrypt/files/truecrypt-6.1-external-wx.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-crypt/truecrypt/files/truecrypt-6.1-external-wx.patch	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,11 @@
+diff -urNp truecrypt-6.1-source.orig/Main/Main.make truecrypt-6.1-source/Main/Main.make
+--- truecrypt-6.1-source.orig/Main/Main.make	2008-11-11 14:05:16.000000000 +0300
++++ truecrypt-6.1-source/Main/Main.make	2008-11-11 15:53:16.000000000 +0300
+@@ -76,6 +76,7 @@ WX_CONFIG_LIBS := base
+ else
+ WX_CONFIG_LIBS := adv,core,base
+ endif
++WX_CONFIG_LIBS =
+ 
+ ifeq "$(TC_BUILD_CONFIG)" "Release"
+ 
diff -r 2864788b37cf -r 86a0cec24d06 app-crypt/truecrypt/truecrypt-6.1a.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-crypt/truecrypt/truecrypt-6.1a.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,105 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils toolchain-funcs multilib wxwidgets
+
+MY_P="${P}.tar.gz"
+
+DESCRIPTION="Free open-source disk encryption software"
+HOMEPAGE="http://www.truecrypt.org/"
+#SRC_URI="TrueCrypt ${PV} Source.tar.gz"
+SRC_URI="${P}.tar.gz
+	pkcs11.h
+	pkcs11f.h
+	pkcs11t.h"
+
+LICENSE="truecrypt-collective-1.4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+RESTRICT="mirror fetch bindist"
+
+RDEPEND="sys-fs/fuse
+	=x11-libs/wxGTK-2.8*"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-source"
+
+pkg_nofetch() {
+	einfo "Please download tar.gz source from:"
+	einfo "http://www.truecrypt.org/downloads2.php"
+	einfo "Then put the file in ${DISTDIR}/${MY_P}"
+	einfo "Please download RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki) 2.20"
+	einfo "header files:"
+	einfo "ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11.h"
+	einfo "ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11f.h"
+	einfo "ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11t.h"
+	einfo "Then put files in ${DISTDIR}"
+}
+
+pkg_setup() {
+	WX_GTK_VER="2.8"
+	if use X; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets base-unicode
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-6.1-64bit.patch"
+	epatch "${FILESDIR}/${PN}-6.1-bool.patch"
+	epatch "${FILESDIR}/${PN}-6.1-external-wx.patch"
+}
+
+src_compile() {
+	local EXTRA
+	use amd64 && EXTRA="${EXTRA} USE64BIT=1"
+	use X || EXTRA="${EXTRA} NOGUI=1"
+	if has_version '<sys-libs/glibc-2.7'; then
+		if [ "$(gcc-version)" = "4.3" ]; then
+			elog "You are trying to compile ${P} using >=sys-devel/gcc-4.3 and <sys-libs/glibc-2.7"
+			elog "In this case compiling will failed if not -O0 optimization flag used."
+			elog "Therefore ${P} will compliling with -O0 flag."
+			elog "Otherwise you could install >=sys-libs/glibc-2.7 or use <sys-devel/gcc-4.3"
+			CFLAGS="${CFLAGS} -O0"
+			CXXFLAGS="${CXXFLAGS} -O0"
+		fi
+	fi
+	emake \
+		${EXTRA} \
+		PKCS11_INC="${DISTDIR}" \
+		NOSTRIP=1 \
+		VERBOSE=1 \
+		NOTEST=1 \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CXX="$(tc-getCXX)" \
+		RANLIB="$(tc-getRANLIB)" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_CXXFLAGS="${CXXFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		WX_CONFIG="${WX_CONFIG}" \
+		WX_CONFIG_EXTRA="" \
+		|| die
+}
+
+src_test() {
+	"${S}/Main/truecrypt" --text --test
+}
+
+src_install() {
+	dobin Main/truecrypt
+	dodoc Readme.txt 'Release/Setup Files/TrueCrypt User Guide.pdf'
+	insinto "/$(get_libdir)/rcscripts/addons"
+	newins "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh"
+}
+
+pkg_postinst() {
+	elog "potential legal problems - use at own risk"
+	elog "http://lists.freedesktop.org/archives/distributions/2008-October/000276.html"
+}
diff -r 2864788b37cf -r 86a0cec24d06 dev-java/ant-bin/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/ant-bin/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,2 @@
+DIST apache-ant-1.8.1-bin.tar.gz 8264796 RMD160 9b84de42f30997f845d73939002f8ea8e9981a84 SHA1 6fc40553c10f9d5a2b57b8b19ba07aeed7fe9fea SHA256 069f1bf786a6bf26c2a0bdd72f74850f12a407389bc566ff9c0dfaafb9f6c8fe
+EBUILD ant-bin-1.8.1.ebuild 789 RMD160 df07e1f8de916638e591da647d182146bf9dbda9 SHA1 dfb20b28a0bdfac841c4ee468776eb8ccd08d26e SHA256 02780337a27676b8e4cdca92e0279b57f0afd39b615cf98ee85876f23d3c3562
diff -r 2864788b37cf -r 86a0cec24d06 dev-java/ant-bin/ant-bin-1.8.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/ant-bin/ant-bin-1.8.1.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,36 @@
+
+inherit java-pkg-2
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+
+MY_P="apache-ant-1.8.1"
+SRC_URI="mirror://apache/ant/binaries/${MY_P}-bin.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SLOT="0"
+RDEPEND=">=virtual/jdk-1.5"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+ANT_SHARE="/usr/share/${PN}"
+
+src_unpack() {
+    unpack ${A}
+
+    rm -v "${S}"/bin/*.bat || die
+    rm -v "${S}"/bin/*.cmd || die
+}
+
+src_install() {
+    dodir "${ANT_SHARE}"
+    cp -Rp bin etc lib fetch.xml get-m2.xml "${D}/${ANT_SHARE}" || die "failed to copy"
+
+    java-pkg_regjar "${D}/${ANT_SHARE}"/lib/*.jar
+
+    dodoc INSTALL KEYS LICENSE NOTICE README WHATSNEW || die
+
+    dodir /usr/bin
+    dosym "${ANT_SHARE}/bin/ant" /usr/bin/ant
+}
diff -r 2864788b37cf -r 86a0cec24d06 dev-java/jrockit-jdk-bin/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/jrockit-jdk-bin/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,12 @@
+AUX jrockit-jdk-bin-1.6.env 644 RMD160 11837c6f9475b6c36353687d4a3492f97ba96a62 SHA1 d3b3718b1cd3c0858983ac5d3a3708925ad7a1c3 SHA256 9dcce217e023f750648313d8455f984d548dad7ece4b6b3a79654b67da888379
+MD5 4abbf0dafb3c13e8f5aea75fba42ce59 files/jrockit-jdk-bin-1.6.env 644
+RMD160 11837c6f9475b6c36353687d4a3492f97ba96a62 files/jrockit-jdk-bin-1.6.env 644
+SHA256 9dcce217e023f750648313d8455f984d548dad7ece4b6b3a79654b67da888379 files/jrockit-jdk-bin-1.6.env 644
+DIST jrockit-R27.3.1-jdk1.6.0_01-linux-ia32.bin 108013278 RMD160 3bc37892bc5150dd59f8339b4c78612d9c8dbc4d SHA1 8c5ca933d726224f5b78a6c48c21165ec5568930 SHA256 a2a7f49fb5b2d0052d171c92877d757739881841c61c631192149f57e2803390
+EBUILD jrockit-jdk-bin-1.6.0.01.ebuild 3456 RMD160 9f4c0cd3737e0a336c7f81f932b5cc447e41b42d SHA1 0f303a37718c299f21878952bddfb2d7b5ac37bc SHA256 ca9dbb17ba1a1b343ad0602b9e04a5a35c158c3b40ec9fca8223d0a0de9ef493
+MD5 f1d557f7b674879029a6c954754419d7 jrockit-jdk-bin-1.6.0.01.ebuild 3456
+RMD160 9f4c0cd3737e0a336c7f81f932b5cc447e41b42d jrockit-jdk-bin-1.6.0.01.ebuild 3456
+SHA256 ca9dbb17ba1a1b343ad0602b9e04a5a35c158c3b40ec9fca8223d0a0de9ef493 jrockit-jdk-bin-1.6.0.01.ebuild 3456
+MD5 0a25dd3c0e25871c1e97c1a882c42c89 files/digest-jrockit-jdk-bin-1.6.0.01 316
+RMD160 069d2719d7acd1332e3c2010f777de71e70866e0 files/digest-jrockit-jdk-bin-1.6.0.01 316
+SHA256 e069ea2884b16a62aa60fc35f1c978ef0416fcf8e8a7e7f55e2bb0667bafa457 files/digest-jrockit-jdk-bin-1.6.0.01 316
diff -r 2864788b37cf -r 86a0cec24d06 dev-java/jrockit-jdk-bin/files/jrockit-jdk-bin-1.6.env
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/jrockit-jdk-bin/files/jrockit-jdk-bin-1.6.env	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,13 @@
+VERSION="WebLogic JRockit @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="/opt/@P@/jre/lib"
+MANPATH="/opt/@P@/man/"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/jrockit.jar:${JAVA_HOME}/jre/lib/managementapi.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff -r 2864788b37cf -r 86a0cec24d06 dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.6.0.01.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.6.0.01.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,113 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+# WARNING: This is the default VM on ia64, so treat this ebuild
+# with proper care.
+
+# The stripping of symbols seems to mess up the BEA code. Not sure why.
+RESTRICT="strip fetch"
+
+inherit java-vm-2 versionator
+
+PV_MAJOR="$(get_version_component_range 1-3 ${PV})"
+PV_EXTRA="$(get_version_component_range 4 ${PV})"
+UPSTREAM_RELEASE="27.3.1"
+
+SRC_URI_BASE="jrockit-R${UPSTREAM_RELEASE}-jdk${PV_MAJOR}_${PV_EXTRA}-linux-"
+#SRC_URI="x86? ( ${SRC_URI_BASE}ia32.bin )
+#		amd64? ( ${SRC_URI_BASE}x64.bin )
+#		ia64? ( ${SRC_URI_BASE}ipf.bin )"
+SRC_URI="x86? ( ${SRC_URI_BASE}ia32.bin )"
+
+DESCRIPTION="BEA WebLogic's J2SE Development Kit, R${UPSTREAM_RELEASE}"
+
+HOMEPAGE="http://commerce.bea.com/products/weblogicjrockit/jrockit_prod_fam.jsp"
+
+LICENSE="jrockit"
+SLOT="1.6"
+KEYWORDS="-* ~amd64 ~ia64 ~x86"
+IUSE="doc examples"
+
+DEPEND="app-arch/unzip"
+RDEPEND="doc? ( =dev-java/java-sdk-docs-1.5.0* )"
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_amd64="opt/${P}/mercuryprofiler/lib/sparc-sunos/libprobejni.so
+	opt/${P}/mercuryprofiler/lib/x86-linux/libprobejni.so"
+
+# not working for some reason...
+# because it probably needs WX_LOAD and not EXECSTACK
+QA_EXECSTACK_amd64="opt/${P}/mercuryprofiler/bin/sparc-sunos/systemmetrics
+	opt/${P}/mercuryprofiler/lib/sparc-sunos/libprobejni.so"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/jrockit/libjvm.so
+opt/${P}/jre/lib/i386/motif21/libmawt.so
+opt/${P}/jre/lib/i386/libjmapi.so
+opt/${P}/mercuryprofiler/lib/x86-linux/libjvmti.so
+opt/${P}/mercuryprofiler/lib/x86-linux/libprobejni.so
+opt/${P}/mercuryprofiler/lib/sparc-sunos64/libjvmti.so
+opt/${P}/mercuryprofiler/lib/sparc-sunos64/libprobejni.so
+opt/${P}/mercuryprofiler/lib/sparc-sunos/libjvmti.so
+opt/${P}/mercuryprofiler/lib/sparc-sunos/libprobejni.so"
+
+QA_EXECSTACK_x86="opt/${P}/bin/*
+opt/${P}/jre/bin/*
+opt/${P}/jre/lib/i386/jrockit/libjvm.so
+opt/${P}/jre/lib/i386/libnet.so"
+
+QA_WX_LOAD_x86="opt/${P}/mercuryprofiler/bin/sparc-sunos/systemmetrics
+opt/${P}/mercuryprofiler/bin/sparc-sunos/reference_sort
+opt/${P}/mercuryprofiler/lib/sparc-sunos64/libjvmti.so
+opt/${P}/mercuryprofiler/lib/sparc-sunos64/libprobejni.so
+opt/${P}/mercuryprofiler/lib/sparc-sunos/libjvmti.so
+opt/${P}/mercuryprofiler/lib/sparc-sunos/libprobejni.so"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from:"
+	einfo ${HOMEPAGE}
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	# unpack cannot determine file format
+	# unzip to get more zips
+	unzip ${DISTDIR}/${A} || die
+
+	mkdir ${S} || die
+
+	# this is ugly but don't see any better way
+	# empty jre dir is part of the zip
+	unzip *sdk_no_jre.zip -d ${S} || die
+	# remove so it doesn't affect next unzip
+	rm *sdk_no_jre.zip || die
+	# unpack the jre into its dir
+	unzip *jre.zip -d ${S}/jre || die
+}
+
+src_install() {
+	local dirs="bin include jre lib missioncontrol src.zip"
+
+	insinto "/opt/${P}"
+	for i in ${dirs} ; do
+		doins -r $i || die
+	done
+
+	if use examples; then
+		doins -r demo || die
+		doins -r sample || die
+	fi
+
+	newdoc README.txt README || die
+	dodoc LICENSE || die
+
+	chmod +x ${D}/opt/${P}/bin/* ${D}/opt/${P}/jre/bin/* || die "Could not chmod"
+	set_java_env
+}
+
+pkg_postinst () {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+	elog "Please review the license agreement in /usr/share/doc/${PF}/LICENSE"
+	elog "If you do not agree to the terms of this license, please uninstall this package"
+}
diff -r 2864788b37cf -r 86a0cec24d06 dev-java/sun-jdk/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/sun-jdk/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,4 @@
+AUX sun-jdk-1.4.env 976 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed SHA1 8cee6524044fc3bc1bde9c9ec02c420c52ec5499 SHA256 b57d36c5a24829add66fb92a8dd4d496e14ea792218c3515dab9573a55cfad49
+DIST j2sdk-1_4_2_19-linux-i586.bin 36387084 RMD160 4d2167bac874d7bce757563d88a9e124b3cb2ca7 SHA1 7c66d03bb6762e549b0644262d08075eb972ac53 SHA256 ce2a2be4ce97313626dd3dc093a7c594fa0f1ffb51e2e12dd341a8091b2c3369
+DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
+EBUILD sun-jdk-1.4.2.19.ebuild 5213 RMD160 530b79d8148058cf2914021795f834e7209d080e SHA1 2b9401bc92289ea853318af38c85eb35c8b9d06e SHA256 96d94c6b234835dbb429a9ee1f63d43ef4f82b7db70f4ec225af857de9d7b0d3
diff -r 2864788b37cf -r 86a0cec24d06 dev-java/sun-jdk/files/sun-jdk-1.4.env
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.env	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.env,v 1.1 2006/06/25 20:06:24 nichoj Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
+LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.4"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff -r 2864788b37cf -r 86a0cec24d06 dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,169 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild,v 1.4 2009/05/29 20:30:58 caster Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit pax-utils java-vm-2 eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_PN=j2sdk
+MY_P=${MY_PN}${MY_PV}
+MY_PVB=${PV%.*}
+
+At="j2sdk-${PV//./_}-linux-i586.bin"
+jce_policy="jce_policy-${MY_PVB//./_}.zip"
+
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Sun's Java SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI="x86? ( ${At} )
+		jce? ( ${jce_policy} )"
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="x86"
+# files are prestripped
+RESTRICT="fetch strip"
+IUSE="X alsa doc examples jce nsplugin odbc"
+
+DEPEND="sys-apps/sed
+	app-arch/unzip"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+DL_PREFIX="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef="
+DOWNLOAD_URL="${DL_PREFIX}${MY_PN}-${MY_PV}-oth-JPR@CDS-CDS_Developer"
+DOWNLOAD_URL_JCE="${DL_PREFIX}7503-jce-1.4.2-oth-JPR@CDS-CDS_Developer"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so
+	opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so
+	opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+	opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
+QA_DT_HASH="opt/${P}/.*"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	einfo "and move it to ${DISTDIR}"
+	if use jce; then
+		echo
+		einfo "Also download ${jce_policy} from:"
+		einfo ${DOWNLOAD_URL_JCE}
+		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
+		einfo "and move it to ${DISTDIR}"
+	fi
+}
+
+src_unpack() {
+	if [ ! -r "${DISTDIR}/${At}" ]; then
+		die "cannot read ${At}. Please check the permission and try again."
+	fi
+	if use jce; then
+		if [ ! -r "${DISTDIR}/${jce_policy}" ]; then
+			die "cannot read ${jce_policy}. Please check the permission and try again."
+		fi
+	fi
+	#Search for the ELF Header
+	testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001')
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} "${DISTDIR}/${At}" > install.sfx
+	chmod +x install.sfx
+	./install.sfx || die
+	rm install.sfx
+
+	if [[ -f ${S}/lib/unpack ]]; then
+		UNPACK_CMD=${S}/lib/unpack
+		chmod +x $UNPACK_CMD
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+		local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar \
+			jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar \
+			jre/javaws/javaws.jar"
+		for i in $PACKED_JARS; do
+			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
+			if [ -f ${PACK_FILE} ]; then
+				echo "	unpacking: $i"
+				$UNPACK_CMD ${PACK_FILE} "${S}"/$i
+				rm -f ${PACK_FILE}
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dirs="bin include jre lib man"
+	dodir /opt/${P}
+
+	cp -dPR ${dirs} "${D}/opt/${P}/"
+
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*)
+
+	dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
+	dohtml README.html || die
+	if use examples; then
+		cp -pPR demo "${D}/opt/${P}/" || die
+	fi
+
+	cp -pPR src.zip "${D}/opt/${P}/" || die
+
+	if use jce ; then
+		# Using unlimited jce while still retaining the strong jce
+		# May have repercussions when you find you cannot symlink libraries
+		# in classpaths.
+		cd "${D}/opt/${P}/jre/lib/security"
+		unzip "${DISTDIR}/${jce_policy}"
+		mv jce unlimited-jce
+		dodir /opt/${P}/jre/lib/security/strong-jce
+		mv "${D}/opt/${P}/jre/lib/security/US_export_policy.jar" \
+			"${D}/opt/${P}/jre/lib/security/strong-jce" || die
+		mv "${D}/opt/${P}/jre/lib/security/local_policy.jar" \
+			"${D}/opt/${P}/jre/lib/security/strong-jce" || die
+		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+	fi
+
+	if use nsplugin; then
+		local plugin_dir="ns610"
+		if has_version '>=sys-devel/gcc-3.2' ; then
+			plugin_dir="ns610-gcc32"
+		fi
+
+		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
+	fi
+
+	# bug #147259
+	dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+	dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+	# Create files used as storage for system preferences.
+	touch "${D}/opt/${P}/.systemPrefs/.system.lock"
+	chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock"
+	touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
+	chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
+
+	# install control panel for Gnome/KDE
+	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+		"${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" > \
+		"${T}/sun_java-${SLOT}.desktop"
+
+	domenu "${T}/sun_java-${SLOT}.desktop"
+
+	set_java_env
+	java-vm_revdep-mask
+}
diff -r 2864788b37cf -r 86a0cec24d06 dev-util/bouml/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/bouml/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,2 @@
+DIST bouml_4.4.1.tar.gz 4621079 RMD160 6e532366a3efa399944675c88d63549c695ea0ef SHA1 edef76f9de7e6d74d67778d3c135323b1ac4ab1c SHA256 d73117423d5b79549e5520e8d816c88eecb4400533fd8bffa7584003739fb3d6
+EBUILD bouml-4.4.1.ebuild 863 RMD160 47066bd3274de00e80f41fbe4238b37e65029d8e SHA1 1e8919260fa88786101ace8225f4e68a3b628022 SHA256 84b59c27cd15b4ed4a1b15a712492c547606df27a31990929c3d9a7a76c1fbb5
diff -r 2864788b37cf -r 86a0cec24d06 dev-util/bouml/bouml-4.4.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/bouml/bouml-4.4.1.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bouml/bouml-3.4.ebuild,v 1.1 2007/12/23 21:27:06 ferdy Exp $
+
+inherit multilib qt3
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Free UML 2 tool with code generation"
+HOMEPAGE="http://bouml.free.fr/"
+SRC_URI="http://bouml.free.fr/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="x11-libs/qt:3"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	find src/ genplugouts/ -type f -name "*.pro" | while read file; do
+		local subdir="${file%/*}"
+		eqmake3 "${file}" -o "${subdir}"/Makefile
+		emake -C "${subdir}" || die "emake failed in ${subdir}"
+	done
+}
+
+src_install() {
+	emake BOUML_LIB="/usr/$(get_libdir)/bouml" DESTDIR="${D}" install \
+		|| die "emake install failed"
+}
diff -r 2864788b37cf -r 86a0cec24d06 layman/.keep_app-portage_layman-0
diff -r 2864788b37cf -r 86a0cec24d06 mail-filter/spambayes/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mail-filter/spambayes/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,6 @@
+DIST spambayes-1.0.1.tar.gz 688955 RMD160 77a66c0d147a6f273029f67f0770129101c5cbd3 SHA1 07bfea7886c9941458c2688dc01a4deb041d8f31 SHA256 3f0417b4d1e7019bacddd4b817401aea7755a9cdafc04a31ba53d37ed348998e
+DIST spambayes-1.0.3.tar.gz 696822 RMD160 689926117f4896abc5d7fc27f712b335241359df SHA1 30a0cdc11741ed1d86a9b0964c0fd756b56174e2 SHA256 db9f50e4518e1cc9e809ed3c516e41f7bae3da49a7f8990e9da6722a643f3e68
+DIST spambayes-1.0.4.tar.gz 697781 RMD160 6dfbaa5cc7eb14d9ddbb68c381580e793cb9c28e SHA1 a7b92eb8465a6ac093d29e64c539ff8348b08c26 SHA256 53c498d98e2f0a88d6edb928e3e1abcf65fc4aee8a98e142175809b9409d30aa
+EBUILD spambayes-1.0.1.ebuild 1325 RMD160 ae6368e1d23e9e682cf512e59e91fd856de1d026 SHA1 1146a78562f9ca29bb154ef5b06b1b97c40c4bf3 SHA256 838f9b65d91b7fbaf5be9d8f6a807c7773074ea618440dd10c07ccd2f4ceac42
+EBUILD spambayes-1.0.3.ebuild 1325 RMD160 d70828530277153d87d276b40bcf891537ba43cc SHA1 3874bda86ebd71f7eb908ecdff42daf4262fa29f SHA256 4cbb1d41bb863f072f3051d67aba8f253db8736916718cad0af78017b319c5b9
+EBUILD spambayes-1.0.4.ebuild 1185 RMD160 c76faeca416fcf186170c1915aab4e284d1afade SHA1 54189565f5a125149516f3f442c5f289b42ef086 SHA256 1afc17bef3bb06791632a2b448d3b0e5ab64c63e39ff0404c33e217b1f1f312f
diff -r 2864788b37cf -r 86a0cec24d06 mail-filter/spambayes/spambayes-1.0.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mail-filter/spambayes/spambayes-1.0.1.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0_rc1.ebuild,v 1.3 2004/06/24 22:22:43 agriffis Exp $
+
+inherit distutils
+
+DESCRIPTION="An anti-spam filter using on Bayesian filtering"
+HOMEPAGE="http://spambayes.sourceforge.net"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://mesh.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
+
+RESTRICT="nomirror"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.2.2"
+
+# removing ".1" from the work directory name
+#S=${WORKDIR}/${MY_P/.1}
+
+src_install() {
+
+	distutils_src_install
+	dodoc *.txt || die "doc *.txt files failed"
+
+	# someone might have benefits of the other documetation too,
+	# therefore added.
+
+	docinto contrib || die "doc directory, contrib, fail"
+	dodoc contrib/* || die "doc contrib/* failed"
+	docinto utilities || die "doc directory, utilities, failed"
+	dodoc utilities/* || die "doc utilities/* failed"
+	docinto testtools || die "doc directory, testtools, failed"
+	dodoc testtools/* || die "doc testtools/* failed"
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/spambayespop3proxy.rc spambayespop3proxy
+
+	insinto /etc
+	doins ${FILESDIR}/bayescustomize.ini
+
+	keepdir /var/lib/spambayes
+
+}
+
diff -r 2864788b37cf -r 86a0cec24d06 mail-filter/spambayes/spambayes-1.0.3.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mail-filter/spambayes/spambayes-1.0.3.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0_rc1.ebuild,v 1.3 2004/06/24 22:22:43 agriffis Exp $
+
+inherit distutils
+
+DESCRIPTION="An anti-spam filter using on Bayesian filtering"
+HOMEPAGE="http://spambayes.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+#SRC_URI="http://mesh.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
+
+RESTRICT="nomirror"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.2.2"
+
+# removing ".1" from the work directory name
+#S=${WORKDIR}/${MY_P/.1}
+
+src_install() {
+
+	distutils_src_install
+	dodoc *.txt || die "doc *.txt files failed"
+
+	# someone might have benefits of the other documetation too,
+	# therefore added.
+
+	docinto contrib || die "doc directory, contrib, fail"
+	dodoc contrib/* || die "doc contrib/* failed"
+	docinto utilities || die "doc directory, utilities, failed"
+	dodoc utilities/* || die "doc utilities/* failed"
+	docinto testtools || die "doc directory, testtools, failed"
+	dodoc testtools/* || die "doc testtools/* failed"
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/spambayespop3proxy.rc spambayespop3proxy
+
+	insinto /etc
+	doins ${FILESDIR}/bayescustomize.ini
+
+	keepdir /var/lib/spambayes
+
+}
+
diff -r 2864788b37cf -r 86a0cec24d06 mail-filter/spambayes/spambayes-1.0.4.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mail-filter/spambayes/spambayes-1.0.4.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0.4.ebuild,v 1.0 2005/04/08 22:22:43 userwaldo Exp $
+
+inherit distutils
+
+DESCRIPTION="An anti-spam filter using on Bayesian filtering"
+HOMEPAGE="http://spambayes.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+RESTRICT="nomirror"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.2.2"
+
+src_install() {
+	distutils_src_install
+	dodoc *.txt || die "doc *.txt files failed"
+	# someone might have benefits of the other documetation too,
+	# therefore added.
+	docinto contrib || die "doc directory, contrib, fail"
+	dodoc contrib/* || die "doc contrib/* failed"
+	docinto utilities || die "doc directory, utilities, failed"
+	dodoc utilities/* || die "doc utilities/* failed"
+	docinto testtools || die "doc directory, testtools, failed"
+	dodoc testtools/* || die "doc testtools/* failed"
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/spambayespop3proxy.rc spambayespop3proxy
+
+	insinto /etc
+	doins ${FILESDIR}/bayescustomize.ini
+
+	keepdir /var/lib/spambayes
+
+}
+
diff -r 2864788b37cf -r 86a0cec24d06 media-sound/exaile/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-sound/exaile/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,2 @@
+DIST exaile-0.3.2.0.tar.gz 2082057 RMD160 70f28f71eac10178a29bab98844a1a1e48f39006 SHA1 08015ab647f5b83997bd2f1c87c14d3d287fd3e7 SHA256 7571db88db5453d09675ed70d8bd5046825b6e7b79ea76b01707e11cd14609eb
+EBUILD exaile-0.3.2.0.ebuild 1759 RMD160 882e47129a0d5e8fe671fc0fe56174c95333b5b0 SHA1 ccc09f44d05ed78f5b454dc2f281f58bd236cabb SHA256 d0b49e48cced5d34c4f795a5455b28ce06328853b0ca2ea2271f69214d2488ac
diff -r 2864788b37cf -r 86a0cec24d06 media-sound/exaile/exaile-0.3.2.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-sound/exaile/exaile-0.3.2.0.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.3.1.1.ebuild,v 1.1 2010/04/16 11:37:14 ssuominen Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+
+inherit fdo-mime multilib python
+
+DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
+HOMEPAGE="http://www.exaile.org/"
+SRC_URI="http://launchpad.net/exaile/0.3.2/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS=""
+IUSE="cddb libnotify nls"
+
+RDEPEND="dev-python/dbus-python
+	>=media-libs/mutagen-1.10
+	>=dev-python/pygtk-2.17
+	>=dev-python/pygobject-2.18
+	dev-python/gst-python:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-meta:0.10
+	libnotify? ( dev-python/notify-python )
+	cddb? ( dev-python/cddb-py )"
+DEPEND="nls? ( dev-util/intltool
+	sys-devel/gettext )"
+
+# Required python 'mox' module missing wrt #315589
+RESTRICT="test"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:exec python:exec $(PYTHON):" \
+		exaile tools/generate-launcher || die
+}
+
+src_compile() {
+	if use nls; then
+		emake locale || die
+	fi
+}
+
+src_install() {
+	local _no_locale
+	use nls || _no_locale=_no_locale
+
+	emake PREFIX="/usr" LIBINSTALLDIR="/$(get_libdir)" DESTDIR="${D}" \
+		install${_no_locale} || die
+
+	dodoc README
+
+	insinto /usr/share/exaile/data
+	doins -r data/migrations || die
+}
+
+pkg_postinst() {
+	python_need_rebuild
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff -r 2864788b37cf -r 86a0cec24d06 net-im/skype/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/skype/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,3 @@
+DIST skype-2.1.0.47.tar.bz2 19748117 RMD160 7b5a3255b6a1db7c622355793ec3e582d9ff2777 SHA1 a0c7918767f01e79c37d4bd4dc085855c111994b SHA256 f4db42b21138ca9d424409f880dd311faa0f5e60003f5bbb82d6006dcfd61971
+DIST skype_static-2.1.0.47.tar.bz2 27323809 RMD160 6e63f345a40bf06d51a9d9d7698bf61992ac93c8 SHA1 aa9a2b6b8bc164ffbaa0141bc0ba7de470792921 SHA256 56b0fa6185661b187a409dc09b99ada3e01fa82aaae5f1048f8a698aa6f86e81
+EBUILD skype-2.1.0.47-r1.ebuild 2946 RMD160 9dd7c2f552fb993c41d90b77863dc90e04cb81b9 SHA1 f9f89a1789c0e4e0ad4214e10223f5b91e809fdd SHA256 9b83733c71538e1192a0665c75ca0e87a1e89217e4de7df6a34232845dd91a73
diff -r 2864788b37cf -r 86a0cec24d06 net-im/skype/skype-2.1.0.47-r1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/skype/skype-2.1.0.47-r1.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,112 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-im/skype/Attic/skype-2.1.0.47-r1.ebuild,v 1.2 2010/01/23 17:17:01 ssuominen dead $
+
+EAPI=2
+
+inherit eutils qt4 pax-utils
+
+DESCRIPTION="A P2P-VoiceIP client."
+HOMEPAGE="http://www.skype.com/"
+
+SFILENAME=${PN}_static-${PV}.tar.bz2
+DFILENAME=${P}.tar.bz2
+SRC_URI="!qt-static? ( http://download.skype.com/linux/${DFILENAME} )
+	qt-static? ( http://download.skype.com/linux/${SFILENAME} )"
+
+LICENSE="skype-eula"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt-static"
+
+# http://bugs.gentoo.org/show_bug.cgi?id=299368
+RESTRICT="mirror strip"
+
+EMUL_VER=20091231
+
+RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-${EMUL_VER}
+			>=app-emulation/emul-linux-x86-baselibs-${EMUL_VER}
+			>=app-emulation/emul-linux-x86-soundlibs-${EMUL_VER}
+			!qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_VER} ) )
+	x86? ( >=media-libs/alsa-lib-1.0.11
+		x11-libs/libXScrnSaver
+		x11-libs/libXv
+		qt-static? ( media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXi
+			x11-libs/libXinerama
+			x11-libs/libXrandr
+			x11-libs/libXrender
+			x11-libs/libX11 )
+		!qt-static? ( x11-libs/qt-gui:4[accessibility,dbus]
+			x11-libs/qt-dbus:4
+			x11-libs/libX11
+			x11-libs/libXau
+			x11-libs/libXdmcp ) )"
+
+# Required for lrelease command at buildtime
+DEPEND="!qt-static? ( x11-libs/qt-core:4 )"
+
+QA_EXECSTACK="opt/skype/skype"
+QA_WX_LOAD="opt/skype/skype"
+QA_DT_HASH="opt/skype/skype"
+QA_PRESTRIPPED="opt/skype/skype"
+
+use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
+
+src_install() {
+	# remove mprotect() restrictions for PaX usage - see Bug 100507
+	# NOTE. Commented out because it's breaking Skype 2.1.0.47.
+	# pax-mark m "${S}"/skype
+
+	exeinto /opt/${PN}
+	doexe skype || die
+	fowners root:audio /opt/skype/skype
+	make_wrapper skype /opt/${PN}/skype /opt/${PN} /opt/${PN} /usr/bin
+
+	insinto /opt/${PN}/sounds
+	doins sounds/*.wav || die
+
+	if ! use qt-static ; then
+		insinto /etc/dbus-1/system.d
+		doins ${PN}.conf || die
+	fi
+
+	insinto /opt/${PN}/lang
+	#
+	#There have been some issues were lang is not updated from the .ts files
+	#but if we have qt we can rebuild it
+	#
+	if ! use qt-static ; then
+		lrelease lang/*.ts
+	fi
+
+	doins lang/*.qm || die
+
+	insinto /opt/${PN}/avatars
+	doins avatars/*.png || die
+
+	insinto /opt/${PN}
+	for X in 16 32 48
+	do
+		insinto /usr/share/icons/hicolor/${X}x${X}/apps
+		newins "${S}"/icons/SkypeBlue_${X}x${X}.png ${PN}.png
+	done
+
+	dodoc README
+
+	# insinto /usr/share/applications/
+	# doins skype.desktop
+	make_desktop_entry ${PN} "Skype VoIP" ${PN} "Network;InstantMessaging;Telephony"
+
+	#Fix for no sound notifications
+	dosym /opt/${PN} /usr/share/${PN}
+
+	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
+	# doexe skype-callto-handler
+}
diff -r 2864788b37cf -r 86a0cec24d06 net-misc/rabbitmq-server/Manifest
diff -r 2864788b37cf -r 86a0cec24d06 sys-apps/servant/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys-apps/servant/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,4 @@
+DIST servant-0.1.5.tar.bz2 77475 RMD160 7dd2946ca1d169faf35192fe6b918e2ca072b6ed SHA1 25b67f1d187e2eb2eb8075ab51d4fe6c7964644e SHA256 8f7ae7d78321564fde4c7a2f65c1093341a962c6dfa78789e2ab728fd041806a
+DIST servant-0.1.7.tar.bz2 135551 RMD160 c52e22ba74ebb1fd00c60c48248a1a91ee69117e SHA1 d807a0a1368e4a9803afb016575ce92a73eae3d9 SHA256 e223742e09f67cc8703a2d74f43b91cdb4a3af78872627a6bc9b18a1f88a19d7
+EBUILD servant-0.1.5.ebuild 944 RMD160 2e5750d8c4afa1146f84c0c0a4d3fcf2ae0f68f0 SHA1 dbeea830eb0c9dc5e16896c9f5f7a46eb114540c SHA256 e99673486bf1625fc82fa459ba8e2b0aef5e10189b7c9f61524eeae3a02fac31
+EBUILD servant-0.1.7.ebuild 944 RMD160 2e5750d8c4afa1146f84c0c0a4d3fcf2ae0f68f0 SHA1 dbeea830eb0c9dc5e16896c9f5f7a46eb114540c SHA256 e99673486bf1625fc82fa459ba8e2b0aef5e10189b7c9f61524eeae3a02fac31
diff -r 2864788b37cf -r 86a0cec24d06 sys-apps/servant/servant-0.1.5.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys-apps/servant/servant-0.1.5.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Graphical rc-update replacement (Qt4)"
+
+# Homepage, not used by Portage directly but handy for developer reference
+HOMEPAGE="http://www.informatik.uni-bremen.de/~momesana/sys-apps/servant/"
+SRC_URI="http://www.informatik.uni-bremen.de/~momesana/sys-apps/servant/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND=">=x11-libs/qt-4.2.0"
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	qmake || die "qmake failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin ${S}/servant || die "dobin ${S}/servant failed"
+	
+	dodoc ${S}/AUTHORS \
+		${S}/COPYING \
+		${S}/ChangeLog \
+		${S}/README \
+		${S}/TODO || die "installing documentation failed"
+	insinto /usr/share/applnk/System/
+	doins ${S}/servant.desktop
+}
+
+pkg_postinst() {
+	einfo "Send your Bugreports to momesana@yahoo.de"
+}
diff -r 2864788b37cf -r 86a0cec24d06 sys-apps/servant/servant-0.1.7.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys-apps/servant/servant-0.1.7.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Graphical rc-update replacement (Qt4)"
+
+# Homepage, not used by Portage directly but handy for developer reference
+HOMEPAGE="http://www.informatik.uni-bremen.de/~momesana/sys-apps/servant/"
+SRC_URI="http://www.informatik.uni-bremen.de/~momesana/sys-apps/servant/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND=">=x11-libs/qt-4.2.0"
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	qmake || die "qmake failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin ${S}/servant || die "dobin ${S}/servant failed"
+	
+	dodoc ${S}/AUTHORS \
+		${S}/COPYING \
+		${S}/ChangeLog \
+		${S}/README \
+		${S}/TODO || die "installing documentation failed"
+	insinto /usr/share/applnk/System/
+	doins ${S}/servant.desktop
+}
+
+pkg_postinst() {
+	einfo "Send your Bugreports to momesana@yahoo.de"
+}
diff -r 2864788b37cf -r 86a0cec24d06 www-apps/redaxo/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/redaxo/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,2 @@
+DIST redaxo4_2_1.zip 2143442 RMD160 18d637be99cf076bf2a9feb59a98357da0db192a SHA1 b8f8a23c2b8b97d2b2eb854fafe3001e22840043 SHA256 4d9daacc0104a47cb05c43ffe6be5445b0ed0d00bee4bea9e58e1ac46fd5d61b
+EBUILD redaxo-4.2.1.ebuild 2003 RMD160 6316f835508f1a20d3052c4fc77f218207bb8255 SHA1 76b8a8a4d0b53b5081c55139f88836841f572251 SHA256 a5b22b487dc4f19aae5f089f463613bf516de62754f885ecdaa266cdc689d308
diff -r 2864788b37cf -r 86a0cec24d06 www-apps/redaxo/redaxo-4.2.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/redaxo/redaxo-4.2.1.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,73 @@
+
+EAPI=2
+inherit webapp depend.php versionator
+
+DESCRIPTION="PHP-powered CMS application."
+HOMEPAGE="http://www.redaxo.de/"
+
+# translate redaxo-0.0.0 to redaxo0_0_0
+MY_PV=$(replace_all_version_separators '_')
+MY_P=${PN}${MY_PV}
+SRC_URI="http://www.redaxo.de/files/${MY_P}.zip"
+
+LICENSE="GPL"
+KEYWORDS="~amd64 ~x86"
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/httpd-cgi"
+
+need_php_httpd
+
+pkg_setup() {
+    webapp_pkg_setup
+
+    if  ! PHPCHECKNODIE="yes" require_php_with_any_use mysql ; then
+            eerror
+            eerror "${PHP_PKG} needs to be reinstalled with the mysql USE flag enabled."
+            die "Reinstall ${PHP_PKG} with the above-stated USE flags."
+    fi
+}
+
+src_unpack() {
+    unpack ${A}
+
+    # clean up some cruft that comes as part of the install package
+    cd ${WORKDIR}/${MY_P}
+    find . -name .DS_Store -exec rm {} \;
+    remove_if_exists _lastchanges.txt
+}
+
+src_install() {
+    webapp_src_preinst
+
+    einfo "Installing application files."
+    cd ${MY_P}
+    cp -r . "${D}"${MY_HTDOCSDIR}
+
+    # .htaccess, index.php and the redaxo dir are part of the distro
+    local SERVEROWNED="index.php files files/_readme.txt files/addons \
+        redaxo redaxo/include/clang.inc.php redaxo/include/plugins.inc.php \
+        redaxo/include/addons.inc.php redaxo/include/master.inc.php \
+        redaxo/include/generated redaxo/include/generated/* \
+        redaxo/include/addons/* redaxo/include/addons/import_export/backup \
+        redaxo/include/addons/image_resize/config.inc.php"
+    for SFILES in ${SERVEROWNED}; do
+        webapp_serverowned ${MY_HTDOCSDIR}/${SFILES}
+    done
+
+    webapp_src_install
+}
+
+webapp_pkg_postinst() {
+    einfo "This ebuild does not perform any autoinstall of the package"
+    einfo ""
+    einfo "This allows you to install redaxo directly into the top of"
+    einfo "your document root using:"
+    einfo "webapp-config -I -h localhost -u root redaxo ${PV}"
+    einfo ""
+}
+
+function remove_if_exists() {
+    if [ -f $1 ]; then
+        rm $1
+    fi
+}
diff -r 2864788b37cf -r 86a0cec24d06 www-apps/serendipity/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/serendipity/Manifest	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,10 @@
+DIST serendipity-1.3.1.tar.gz 4482417 RMD160 40565957b31bad1c41506abf9bb9d8c20eb13d92 SHA1 623d689136fa9e9a5b013046090392b016cf09fa SHA256 6304a5885f3c60188c1d49aa74e85908788ce50e006e9443a649be9f902edcba
+DIST serendipity-1.4.1.tar.gz 5278932 RMD160 56eb582c37d9f0a21e0f38f067a3c8f42946ed60 SHA1 03a9511dcd11b08b2fb3d5a129072a1158224b60 SHA256 e950cff732323aaf3243d3a28afd18322cc7ab86daf81b21c2b4a2667d70e6f7
+DIST serendipity-1.4.tar.gz 5277144 RMD160 d03ee511172863433eac3c6b96fc254db0acab4b SHA1 fdafeb0374e8bf9ca4ff1845d13a67fbade54d58 SHA256 c636c4199d26eb262c077997850fa871a160c067404250752e8ca2d0804e098a
+DIST serendipity-1.5.1.tar.gz 5337760 RMD160 5a14551f727230e0c134a0aff555c40a0856ece6 SHA1 4f7712835480b24b05de68fc6af2f7c7fb700377 SHA256 5e6dc05208e115c3068f91a91687aa91078f19a36e630104146e2fc8a0ffcbe9
+DIST serendipity-1.5.2.tar.gz 5337799 RMD160 9210d2982b28459929488a46b8cba70efd220cd1 SHA1 58ba1d14d0beb07d538968ddfa7f95419002251b SHA256 75544fd4104a2b1afbac6a80aa8ff0bb5bfc008dcdaa1e4531740d96e00465e5
+EBUILD serendipity-1.3.1.ebuild 1976 RMD160 44845a102490482da1fe3ff4ee2950069b411d47 SHA1 be7d9821dac7feac30927f077dc4765dfd04a5fd SHA256 5a06f6ae838bacdcaa4cfe0ca4f90ff6a10081b6eb20df457cc47e9b0db06f38
+EBUILD serendipity-1.4.1.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465
+EBUILD serendipity-1.4.ebuild 1976 RMD160 44845a102490482da1fe3ff4ee2950069b411d47 SHA1 be7d9821dac7feac30927f077dc4765dfd04a5fd SHA256 5a06f6ae838bacdcaa4cfe0ca4f90ff6a10081b6eb20df457cc47e9b0db06f38
+EBUILD serendipity-1.5.1.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465
+EBUILD serendipity-1.5.2.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465
diff -r 2864788b37cf -r 86a0cec24d06 www-apps/serendipity/serendipity-1.3.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/serendipity/serendipity-1.3.1.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp depend.php
+
+DESCRIPTION="PHP-powered, flexible blogging/CMS application."
+HOMEPAGE="http://www.s9y.org/"
+SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="imagemagick"
+
+DEPEND=""
+RDEPEND="virtual/httpd-cgi
+	imagemagick? ( media-gfx/imagemagick )"
+
+need_php_httpd
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	 webapp_pkg_setup
+
+	if  ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \
+		|| ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \
+			|| ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode zlib ; then
+			eerror
+			eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli,"
+			eerror "postgres or sqlite USE flags enabled for a database backend."
+			eerror "It must also have either gd or gd-external USE flag enabled."
+			eerror "It must also have all of iconv pcre unicode zlib USE flags enabled."
+			die "Reinstall ${PHP_PKG} with the above-stated USE flags."
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	rm docs/INSTALL*
+	local docs="docs/*"
+	dodoc ${docs}
+	rm -rf docs/
+
+	einfo "Installing application files."
+	cp -r . "${D}"${MY_HTDOCSDIR}
+	touch "${D}"${MY_HTDOCSDIR}/.htaccess
+	touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+
+	keepdir ${MY_HTDOCSDIR}/archives/
+	webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+	#webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	# archives, templates_c and uploads need to be writable to PHP
+	# .htaccess amd serendipity_config_local.inc.php need to be too
+	# plugins and templates need to be writable for spartacus support.
+	local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads"
+	for SFILES in ${SERVEROWNED}; do
+		webapp_serverowned ${MY_HTDOCSDIR}/${SFILES}
+	done
+
+	webapp_src_install
+}
diff -r 2864788b37cf -r 86a0cec24d06 www-apps/serendipity/serendipity-1.4.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/serendipity/serendipity-1.4.1.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp depend.php
+
+DESCRIPTION="PHP-powered, flexible blogging/CMS application."
+HOMEPAGE="http://www.s9y.org/"
+SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="imagemagick"
+
+DEPEND=""
+RDEPEND="virtual/httpd-cgi
+    imagemagick? ( media-gfx/imagemagick )"
+
+need_php_httpd
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+     webapp_pkg_setup
+
+    if  ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \
+        || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \
+            || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then
+            eerror
+            eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli,"
+            eerror "postgres or sqlite USE flags enabled for a database backend."
+            eerror "It must also have either gd or gd-external USE flag enabled."
+            eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled."
+            die "Reinstall ${PHP_PKG} with the above-stated USE flags."
+    fi
+}
+
+src_install() {
+    webapp_src_preinst
+
+    rm docs/INSTALL*
+    local docs="docs/*"
+    dodoc ${docs}
+    rm -rf docs/
+
+    einfo "Installing application files."
+    cp -r . "${D}"${MY_HTDOCSDIR}
+    touch "${D}"${MY_HTDOCSDIR}/.htaccess
+    touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+
+    keepdir ${MY_HTDOCSDIR}/archives/
+    webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+    #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+    # archives, templates_c and uploads need to be writable to PHP
+    # .htaccess amd serendipity_config_local.inc.php need to be too
+    # plugins and templates need to be writable for spartacus support.
+    local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads"
+    for SFILES in ${SERVEROWNED}; do
+        webapp_serverowned ${MY_HTDOCSDIR}/${SFILES}
+    done
+
+    webapp_src_install
+}
diff -r 2864788b37cf -r 86a0cec24d06 www-apps/serendipity/serendipity-1.4.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/serendipity/serendipity-1.4.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp depend.php
+
+DESCRIPTION="PHP-powered, flexible blogging/CMS application."
+HOMEPAGE="http://www.s9y.org/"
+SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="imagemagick"
+
+DEPEND=""
+RDEPEND="virtual/httpd-cgi
+	imagemagick? ( media-gfx/imagemagick )"
+
+need_php_httpd
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	 webapp_pkg_setup
+
+	if  ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \
+		|| ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \
+			|| ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode zlib ; then
+			eerror
+			eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli,"
+			eerror "postgres or sqlite USE flags enabled for a database backend."
+			eerror "It must also have either gd or gd-external USE flag enabled."
+			eerror "It must also have all of iconv pcre unicode zlib USE flags enabled."
+			die "Reinstall ${PHP_PKG} with the above-stated USE flags."
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	rm docs/INSTALL*
+	local docs="docs/*"
+	dodoc ${docs}
+	rm -rf docs/
+
+	einfo "Installing application files."
+	cp -r . "${D}"${MY_HTDOCSDIR}
+	touch "${D}"${MY_HTDOCSDIR}/.htaccess
+	touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+
+	keepdir ${MY_HTDOCSDIR}/archives/
+	webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+	#webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	# archives, templates_c and uploads need to be writable to PHP
+	# .htaccess amd serendipity_config_local.inc.php need to be too
+	# plugins and templates need to be writable for spartacus support.
+	local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads"
+	for SFILES in ${SERVEROWNED}; do
+		webapp_serverowned ${MY_HTDOCSDIR}/${SFILES}
+	done
+
+	webapp_src_install
+}
diff -r 2864788b37cf -r 86a0cec24d06 www-apps/serendipity/serendipity-1.5.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/serendipity/serendipity-1.5.1.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp depend.php
+
+DESCRIPTION="PHP-powered, flexible blogging/CMS application."
+HOMEPAGE="http://www.s9y.org/"
+SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="imagemagick"
+
+DEPEND=""
+RDEPEND="virtual/httpd-cgi
+    imagemagick? ( media-gfx/imagemagick )"
+
+need_php_httpd
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+     webapp_pkg_setup
+
+    if  ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \
+        || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \
+            || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then
+            eerror
+            eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli,"
+            eerror "postgres or sqlite USE flags enabled for a database backend."
+            eerror "It must also have either gd or gd-external USE flag enabled."
+            eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled."
+            die "Reinstall ${PHP_PKG} with the above-stated USE flags."
+    fi
+}
+
+src_install() {
+    webapp_src_preinst
+
+    rm docs/INSTALL*
+    local docs="docs/*"
+    dodoc ${docs}
+    rm -rf docs/
+
+    einfo "Installing application files."
+    cp -r . "${D}"${MY_HTDOCSDIR}
+    touch "${D}"${MY_HTDOCSDIR}/.htaccess
+    touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+
+    keepdir ${MY_HTDOCSDIR}/archives/
+    webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+    #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+    # archives, templates_c and uploads need to be writable to PHP
+    # .htaccess amd serendipity_config_local.inc.php need to be too
+    # plugins and templates need to be writable for spartacus support.
+    local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads"
+    for SFILES in ${SERVEROWNED}; do
+        webapp_serverowned ${MY_HTDOCSDIR}/${SFILES}
+    done
+
+    webapp_src_install
+}
diff -r 2864788b37cf -r 86a0cec24d06 www-apps/serendipity/serendipity-1.5.2.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/serendipity/serendipity-1.5.2.ebuild	Wed Aug 11 04:08:09 2010 +0200
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp depend.php
+
+DESCRIPTION="PHP-powered, flexible blogging/CMS application."
+HOMEPAGE="http://www.s9y.org/"
+SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="imagemagick"
+
+DEPEND=""
+RDEPEND="virtual/httpd-cgi
+    imagemagick? ( media-gfx/imagemagick )"
+
+need_php_httpd
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+     webapp_pkg_setup
+
+    if  ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \
+        || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \
+            || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then
+            eerror
+            eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli,"
+            eerror "postgres or sqlite USE flags enabled for a database backend."
+            eerror "It must also have either gd or gd-external USE flag enabled."
+            eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled."
+            die "Reinstall ${PHP_PKG} with the above-stated USE flags."
+    fi
+}
+
+src_install() {
+    webapp_src_preinst
+
+    rm docs/INSTALL*
+    local docs="docs/*"
+    dodoc ${docs}
+    rm -rf docs/
+
+    einfo "Installing application files."
+    cp -r . "${D}"${MY_HTDOCSDIR}
+    touch "${D}"${MY_HTDOCSDIR}/.htaccess
+    touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+
+    keepdir ${MY_HTDOCSDIR}/archives/
+    webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php
+    #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+    # archives, templates_c and uploads need to be writable to PHP
+    # .htaccess amd serendipity_config_local.inc.php need to be too
+    # plugins and templates need to be writable for spartacus support.
+    local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads"
+    for SFILES in ${SERVEROWNED}; do
+        webapp_serverowned ${MY_HTDOCSDIR}/${SFILES}
+    done
+
+    webapp_src_install
+}