Sync with portage [Sun Mar 24 22:48:34 MSK 2013].

app-admin/eselect-php/Manifest

@@ -2,3 +2,4 @@ DIST eselect-php-0.6.2.bz2 1454 SHA256 c4eecb73aaf50538a8eaf8afb0d52b3666b45ef19
 DIST eselect-php-0.6.4.bz2 1533 SHA256 6481f82c89ffe15ede967ffa8b895496ad23ac638931ee58108e91a4badbeef1 SHA512 aaea307e3e3f8e85a92847b2ef4ce2f7ccacd18219d34c6b3c3af974741e72174134db4debce334bd44f342b56dc443a4692273881afb228af0b75b13b34f712 WHIRLPOOL 25da6ba132f0ed6cccc5c24371ba4a8949ea607b30b5e965353884474a1b0e1550601469af3411794d33dd99c443e0918905f86593d9d60ceded73583be46286
 DIST eselect-php-0.6.6.bz2 1837 SHA256 7324d92086dad38942dfc053f2775af6f41f3e2f9d19472a7569e4f58aae0f86 SHA512 ba7cc1fc4183a401e2d344348f6a624f0fe947200c0ff69f9ac948b6ff56fa476a3beb9b4cc19f70ec15c4856897a9cf69c7b69d1909321287c071171c59009f WHIRLPOOL dde3be270f42775feec923c5094da68d897c961498a4c94de825954809eeb390ef2766e0e8c910560c9db4289a0144830c6ba401608b2d9536e8bd0b30418243
 DIST eselect-php-0.6.7.bz2 1840 SHA256 59cd22ee84c7754bcb416d841302e13d0367bc4d282bd3174590165070c473fa SHA512 4a37f031a20967c2d32972647b3594ec8239e55909cb2e131d63b6421665b003d6d6a512b0ed33c36a51e431cf6bc40061bb003fc8a79801799396835816b511 WHIRLPOOL efa64529bd24a3f565c084c3108a7093fa973f974a66697ff71acf7e3f97915d0918ead7e4ea5f071d845c3784edc1f97ed3225c0ad94486393b6abe24c4532a
+DIST eselect-php-0.7.0.bz2 2252 SHA256 386abbab747e617e18a39d359c816ccd94cdf8048ea51e6e185370be157f0194 SHA512 be36e23bb7940b013941da9d0e73e29184cc55a929c1c59b81ae265203dceed9b040950925eafa723adc041afe6cf841e54f3db0e3d76627e974f075f4528e9e WHIRLPOOL ca7f5507ce37ce8d9b9560797836e6a8610a8a9f61a125858b38a78e7418356a2b9787d92cf09ef13196f379b548710b2ea23b3333aba7e499dd685c0110ab86

app-admin/eselect-php/eselect-php-0.7.0.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/eselect-php-0.7.0.ebuild,v 1.1 2013/03/23 19:42:13 olemarkus Exp $
+
+EAPI=5
+
+inherit depend.apache
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+DEPEND=">=app-admin/eselect-1.2.4
+		!!<dev-lang/php-5.3.23-r1:5.3
+		!!<dev-lang/php-5.4.13-r1:5.4
+		!!<dev-lang/php-5.5.0_beta1-r2:5.5
+		"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+want_apache
+
+src_install() {
+	mv eselect-php-${PV} php.eselect
+	insinto /usr/share/eselect/modules/
+	doins php.eselect
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+		newins "${FILESDIR}/70_mod_php5.conf-apache2" \
+			"70_mod_php5.conf"
+	fi
+
+	if use fpm ; then
+		dodir "/etc/init.d"
+		insinto "/etc/init.d"
+		newinitd "${FILESDIR}/php-fpm.init" "php-fpm"
+	fi
+}

app-admin/eselect-php/files/70_mod_php5.conf-apache2

@@ -0,0 +1,14 @@
+<IfDefine PHP5>
+	# Load the module first
+	<IfModule !mod_php5.c>
+		LoadModule php5_module    modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	<IfModule mod_mime.c>
+		AddHandler application/x-httpd-php .php .php5 .phtml
+		AddHandler application/x-httpd-php-source .phps
+	</IfModule>
+
+	DirectoryIndex index.php index.phtml
+</IfDefine>

app-admin/eselect-php/files/php-fpm

@@ -0,0 +1,49 @@
+#!/sbin/runscript
+
+set_phpvars() {
+	PHPSLOT=${SVCNAME#php-fpm-}
+	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
+
+	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+
+	[ ${PHPSLOT} = 'php-fpm' ] && PHP_FPM_PID="/var/run/php-fpm.pid"
+}
+
+extra_commands="depend"
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use apache2 lighttpd nginx
+}
+
+start() {
+        ebegin "Starting PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
+            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
+        local i=0
+        local timeout=5
+        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
+            sleep 1
+            i=$(($i + 1))
+        done
+        
+        [ $timeout -gt $i ]
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
+        eend $?
+}
+
+reload() {
+    ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
+    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
+    eend $?
+}

app-admin/eselect-php/files/php-fpm.init

@@ -0,0 +1,47 @@
+#!/sbin/runscript
+
+set_phpvars() {
+	PHPSLOT=${SVCNAME#php-fpm-}
+	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
+
+	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+}
+
+extra_commands="depend"
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use apache2 lighttpd nginx
+}
+
+start() {
+        ebegin "Starting PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
+            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
+        local i=0
+        local timeout=5
+        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
+            sleep 1
+            i=$(($i + 1))
+        done
+        
+        [ $timeout -gt $i ]
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
+        eend $?
+}
+
+reload() {
+    ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
+    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
+    eend $?
+}

app-admin/eselect-php/metadata.xml

@@ -4,5 +4,8 @@
 	<herd>php</herd>
 	<longdescription lang="en">PHP eselect module
 	</longdescription>
+	<use>
+		<flag name='fpm'>Enable the FastCGI Process Manager SAPI</flag>
+	</use>
 </pkgmetadata>
 

app-admin/python-updater/Manifest

@@ -1 +1,2 @@
 DIST python-updater-0.10.tar.bz2 9245 SHA256 7defcf844e3751ce0ead132116b727f947715c7545a7a2f8ffba7cf375213520 SHA512 4e6ce62fef67bc7fd7738d15b49ddff5f0c5c202a197b783bc4ce78005134d0c541ef32e3591cb6523976b2d6a38441677e819905f127e7b25ec1c0f5bf9d68b WHIRLPOOL b68db0d05c03a6aa68f595d23ff072deafa67e1460350e71bac6a30465c4d60459ff6cef54a1bbc4c87711f5d20843aedb575c1248fd698478b23abfbef26eee
+DIST python-updater-0.11.tar.bz2 9355 SHA256 5c88b2a56febe67e783855a1c51c4c89637e948704834ad1f5d1b6e46cc4a7b8 SHA512 613d0b772faed65690b3999fb557f4414926f72f2f6084cf2e91c225a036df8c1a3c73e4fa6feac191cb7ac89035d3bcae9a6b23f479e2cf63d69bb8c57217fe WHIRLPOOL 9eab112192a3515e71d4971b89282d3f9725629af5b4db6a090d74f4c3dc9421dbfbc9c6c0393b3d6387d4926b1eb1bbc6291ac18ae31e86ecfeb37cfba68b14

app-admin/python-updater/python-updater-0.11.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.11.ebuild,v 1.1 2013/03/24 15:38:57 floppym Exp $
+
+EAPI=5
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-2
+fi
+
+DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
+HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/python-updater.git"
+else
+	SRC_URI="http://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
+RDEPEND="dev-lang/python
+	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
+
+src_compile() {
+	if [[ "${PV}" == "9999" ]]; then
+		emake ${PN}.1 || die "Generation of man page failed"
+	fi
+}
+
+src_install() {
+	dosbin ${PN}
+	doman ${PN}.1
+	dodoc AUTHORS
+}

app-admin/python-updater/python-updater-9999.ebuild

@@ -1,23 +1,25 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.8 2011/12/30 17:41:45 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.9 2013/03/24 15:38:57 floppym Exp $
+
+EAPI=5
 
 if [[ "${PV}" == "9999" ]]; then
-	inherit subversion
+	inherit git-2
 fi
 
 DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
 HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
-	ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/python-updater.git"
 else
-	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
+	SRC_URI="http://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
@@ -31,7 +33,7 @@ src_compile() {
 }
 
 src_install() {
-	dosbin ${PN} || die "dosbin failed"
-	doman ${PN}.1 || die "doman failed"
-	dodoc AUTHORS || die "dodoc failed"
+	dosbin ${PN}
+	doman ${PN}.1
+	dodoc AUTHORS
 }

app-antivirus/clamav/clamav-0.97.7.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.7.ebuild,v 1.6 2013/03/23 13:25:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.7.ebuild,v 1.7 2013/03/24 16:11:11 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )

app-backup/obnam/Manifest

@@ -1,2 +1,3 @@
 DIST obnam_1.2.orig.tar.gz 141515 SHA256 33457452726d5c393d98c565b8e1ab3ac11276cc42bf67c4eee6c4e4ac9976d6 SHA512 9e2bbe94963215911e334c6c7ed89f7b3e9fe4904a371c9eae5290d522c60a10a31ac19009941a7199f217b84be168e188f3beb930b359a637c9c85cddb9586b WHIRLPOOL 29db843b7fd9e0b0178cea8d263dc16076eb8d339319beff704f408f1c4b93836b7b6d03dceb9bf63e7f71ddad438d173040d12ee63b3b2030774e7594c04b6a
 DIST obnam_1.3.orig.tar.gz 148662 SHA256 1c3de236ecca2a71663f478f78d0dceaf3576ed448d492a5e1129f6d272ab1c2 SHA512 eca270ae1a93706cbb058f284ab793811c382794954235f9fa02e527bfc99ec780e0d39f94035f6cc77b28e494db291a61fea5f183e19cff5a8c0602481bda3d WHIRLPOOL 8277b61657d4cfb9be877182bac222b28386b80a10347d79cd9aff44e48c2fa7e5f04ebe73b1a4821a1a69328c83aa7b5b8e0b0448dbfb2a513fa944abc7238f
+DIST obnam_1.4.orig.tar.gz 151955 SHA256 cec92a28a13dade6b9f8be03a5747040c4f136a291ddc6420f365d20205c373e SHA512 e5a0bf278685466e6cdd84e10cbaa244079e258bb1635b692a0abab669aaac6353f27478d970204cf27b25d5fb256dc6fad27f75d4564318e77b357e0618e33b WHIRLPOOL 8f52703ee88c1dccbdb0217a9845a89eaf65215db120dfc251ca7aa676e36642facd4801c8c5ae0069ebe1aeab7c1920b618ae992b3f60f1f02bafeb457a27b3

app-backup/obnam/obnam-1.4.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.4.ebuild,v 1.1 2013/03/24 13:02:44 mschiff Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_MODNAME="${PN}lib"
+MY_P="${PN}_${PV}.orig"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A backup program that supports encryption and deduplication"
+HOMEPAGE="http://liw.fi/obnam/"
+SRC_URI="http://code.liw.fi/debian/pool/main/o/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/cliapp
+	>=dev-python/larch-1.20121216
+	dev-python/paramiko
+	dev-python/tracing
+	dev-python/ttystatus
+	"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	addwrite /proc/self/comm
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	rm "${D}"/usr/bin/obnam-{benchmark,viewprof}*
+	rm "${D}"/usr/share/man/man1/obnam-{benchmark,viewprof}*
+	insinto /etc
+	doins "${FILESDIR}"/obnam.conf
+	keepdir /var/log/obnam
+}
+
+pkg_postinst() {
+	if [[ $REPLACING_VERSIONS < "1.2" ]]; then
+		elog "You will need to setup a config file before running obnam for the first time."
+		elog "For details, please see the obnam(1) manual page."
+		elog "An example file has been installed as /etc/obnam.conf for your convenience."
+	fi
+}

app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild,v 1.5 2013/03/02 19:12:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild,v 1.6 2013/03/23 19:44:29 vapier Exp $
 
 EAPI=4
 
-inherit eutils versionator
+inherit eutils versionator unpacker
 
 REV=$(get_version_component_range 3)
 SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
@@ -38,12 +38,6 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-}
-
 src_prepare() {
 	# change /usr/ to /opt/SpiderOak/ in start script
 	sed -i 's:/usr/lib:/opt:g' usr/bin/SpiderOak || die "sed failed"

app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild,v 1.3 2013/03/02 19:12:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild,v 1.4 2013/03/23 19:44:29 vapier Exp $
 
 EAPI="4"
 
-inherit eutils versionator
+inherit eutils versionator unpacker
 
 REV=$(get_version_component_range 3)
 SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
@@ -58,13 +58,6 @@ S=${WORKDIR}
 
 QA_PREBUILT="*"
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/opt-path.patch
 	use headless && epatch "${FILESDIR}"/headless.patch
@@ -131,8 +124,7 @@ src_install() {
 	doins -r etc
 
 	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
+	dodoc usr/share/doc/spideroak/changelog.gz
 
 	if ! use headless ; then
 		domenu usr/share/applications/spideroak.desktop

app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild,v 1.3 2013/03/02 19:12:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild,v 1.4 2013/03/23 19:44:29 vapier Exp $
 
 EAPI="4"
 
-inherit eutils versionator
+inherit eutils versionator unpacker
 
 REV=$(get_version_component_range 3)
 SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
@@ -58,13 +58,6 @@ S=${WORKDIR}
 
 QA_PREBUILT="*"
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/opt-path.patch
 	use headless && epatch "${FILESDIR}"/headless.patch
@@ -131,8 +124,7 @@ src_install() {
 	doins -r etc
 
 	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
+	dodoc usr/share/doc/spideroak/changelog.gz
 
 	if ! use headless ; then
 		domenu usr/share/applications/spideroak.desktop

app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.4 2013/03/02 19:12:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.5 2013/03/23 19:44:29 vapier Exp $
 
 EAPI="4"
 
-inherit eutils versionator
+inherit eutils versionator unpacker
 
 REV=$(get_version_component_range 3)
 SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
@@ -58,13 +58,6 @@ S=${WORKDIR}
 
 QA_PREBUILT="*"
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PF}-opt-path.patch
 	use headless && epatch "${FILESDIR}"/${PF}-headless.patch
@@ -141,8 +134,7 @@ src_install() {
 	doins -r etc
 
 	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
+	dodoc usr/share/doc/spideroak/changelog.gz
 
 	if ! use headless ; then
 		domenu usr/share/applications/spideroak.desktop

app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild,v 1.1 2013/01/24 04:31:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild,v 1.2 2013/03/23 19:44:29 vapier Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils unpacker
 
 SRC_URI_BASE="https://spideroak.com/getbuild?platform=ubuntu"
 
@@ -41,13 +41,6 @@ S=${WORKDIR}
 
 QA_PREBUILT="*"
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
 src_prepare() {
 	use headless && epatch "${FILESDIR}"/${PF}-headless.patch
 

app-dicts/aspell-en/Manifest

@@ -1,3 +1,3 @@
-DIST aspell-en-0.51-0.tar.bz2 172819 SHA256 31eef38c7a5425bd5de24b22e5c0f9763f82129a5a1990745d51dde486f75387 SHA512 d138c3b36381fbdfba7cc3cccf2961aca9432f02daf8444c53eacf95f4eb69966b4a3340e6a7b31229d90132b8a91463214141b389619520bd293ffe16aa42a8 WHIRLPOOL dc26ae3159eea494beb51a18e537173453cba93f756c36ac1822b4d4c8ff66190b63752024a415e329a8835b4ee43e1f8e6633e0289af53830865cc77214090d
 DIST aspell-en-0.51-1.tar.bz2 172874 SHA256 0a853f7f117a79bcc92740c19386b46a832d12eacd73cee1ceba591953486065 SHA512 c7ed17abe9d11fe917f2fccd4402fe24b417d8ea4710004a34f35dfc53663b3592fbb12d421553716c63fd8456be241af5d7a1d1adff8f55014b3cd0d757612d WHIRLPOOL 2c6e1787ba948f3b415bd94e8b4eb8a57a4333c400cfd57d04436547ed459b8bfb0c5523f0fe0cfc5d34427f1dfbaf7d55bcc4e8652d6754c8a5b84c4628bc59
 DIST aspell6-en-6.0-0.tar.bz2 182442 SHA256 24f0688711d2b893fa06c16d14d0aa3a8000e326226b839aad32611f7ace4898 SHA512 ceda45c27bd7fbd91ab202f2fabfcb7078c725a3539d7ca7dc278f67bf1e814e5776e4466147d98afa660451c07522fbd058de7663ad870bec6f61baf4ab718d WHIRLPOOL 59a84e74ef2e9b62ee2fc9e830552591e678eb1071bf44259b33974465c056492f8eb7d9dbc61c6c1f40ad2784fbece46b6a324aa5a88e9422f1bb0bb898b552
+DIST aspell6-en-7.1-0.tar.bz2 175360 SHA256 ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a SHA512 4ede7cb1d231929835e5aa25d1d067ce2f59064e42a27b271e5fd1afdf6e418220720caad2a0c16ec63485e37528d9a515ba55035caeb01372b57410e1152f0f WHIRLPOOL b2e412a3de3a00347f760be2f6e95ccab6c1a9d8320e02408d71524e5fdc12d534f40e9a905fe1abc2f4902571ea30c87a7c3ff050c22d93307a1a6aaf8fb8e4

app-dicts/aspell-en/aspell-en-0.51.0.ebuild

@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-en/aspell-en-0.51.0.ebuild,v 1.10 2012/12/14 11:57:57 ulm Exp $
-
-ASPELL_LANG="English (US, British, Canadian)"
-
-inherit aspell-dict
-
-LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
-IUSE=""

app-dicts/aspell-en/aspell-en-7.1.0.ebuild

@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-en/aspell-en-7.1.0.ebuild,v 1.1 2013/03/24 08:20:10 pva Exp $
+
+ASPELL_LANG="English (US, British, Canadian)"
+ASPOSTFIX="6"
+
+inherit aspell-dict
+
+LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE=""

app-emacs/emacs-daemon/Manifest

@@ -1,2 +1,2 @@
-DIST emacs-daemon-0.18.tar.bz2 5074 SHA256 6c5f32e71e220fe0bac089af1fda75b1412ff4902e08740d093bc79b7a75450c SHA512 d34b5c276760128f877ee8d50b45f4a37077a19d80611512e47911ba37c4f62d81042fc26f8e824a2ca2b42a0b171d03bcfdc35550f07298a64aaadd0569086a WHIRLPOOL f04836958a044f2af35d926d4c628120b0b674bfe87e47d171eb310fcdf500313ac1e86a41ebcd33c33ea911a0883a55258731972c78ab575ba6736780bbae8e
 DIST emacs-daemon-0.19.tar.bz2 4988 SHA256 63231c4c0d04310eeeb432d33d195b620b5b8308aecfdb93825df0c4acc4a341 SHA512 f1684387f3018f1dcb2d9d600a4155ce7980264e817aff762a49b04ac0b01fe6ab68bb702694a9eba28770c4eaadbc1a02ef570270eb5b8369c789c7fc60370a WHIRLPOOL ec18ebae334e1da36aa79a0542cb3563962e5542fdaba72f667adc9831406ad8ac99dddf5ec649127eaff8d67890d3c8f6acdd32a79f33c27e8554157674ef59
+DIST emacs-daemon-0.20.tar.xz 5120 SHA256 5c0f0bc9a1fab391657737fc3b6af4088eff1ead2e05987fe50e02f5b6e50eb3 SHA512 ac1bfc543f38dd86aeef544a8d03aa2f2a6cb02ee2042ecb3f339baed98294deac1fc6d3d002e654f3d9f32f00379c4de40efa226ddd07715aee7fe0fcb41e43 WHIRLPOOL 5941c1ea18d238275aab312123eb598f3d3265f279674191a75bec6bfd6efeebadb20dc7e6db6454a9da10ed8e98b2916fad195741b4d5fddbb270528e040d63

app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.9 2012/09/30 17:08:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.10 2013/03/23 22:08:32 ulm Exp $
 
 inherit elisp
 
@@ -8,7 +8,7 @@ DESCRIPTION="Gentoo support for Emacs running as a server in the background"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""

app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild

@@ -1,17 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild,v 1.9 2011/12/26 00:49:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild,v 1.1 2013/03/23 22:08:32 ulm Exp $
+
+EAPI=5
 
 inherit elisp
 
 DESCRIPTION="Gentoo support for Emacs running as a server in the background"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 DEPEND=">=virtual/emacs-23"
 RDEPEND="${DEPEND}"
@@ -35,7 +36,8 @@ pkg_setup() {
 		bug in GTK+ that prevents Emacs from recovering from X disconnects:
 		<http://bugzilla.gnome.org/show_bug.cgi?id=85715>
 		If you run Emacs as a daemon, then it is strongly recommended that
-		you compile it with the Lucid toolkit, i.e. with USE="Xaw3d -gtk".
+		you compile it with the Motif or the Lucid toolkit instead, i.e.
+		with USE="motif -athena -gtk" or USE="athena -gtk -motif".
 		EOF
 	fi
 }
@@ -43,10 +45,10 @@ pkg_setup() {
 src_compile() { :; }
 
 src_install() {
-	newinitd emacs.rc emacs || die
-	newconfd emacs.conf emacs || die
+	newinitd emacs.rc emacs
+	newconfd emacs.conf emacs
 	exeinto /usr/libexec/emacs
-	doexe emacs-wrapper.sh emacs-stop.sh || die
-	elisp-site-file-install "${SITEFILE}" || die
-	dodoc README ChangeLog || die
+	doexe emacs-wrapper.sh emacs-stop.sh
+	elisp-site-file-install "${SITEFILE}"
+	dodoc README ChangeLog
 }

app-emulation/libvirt/libvirt-9999.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.44 2012/11/29 02:13:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.45 2013/03/23 20:30:09 cardoe Exp $
 
-EAPI=4
+EAPI=5
 
-#BACKPORTS=85e8c146
+#BACKPORTS=9bf6bec4
 AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
@@ -22,8 +22,8 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz
+	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
 		${BACKPORTS:+
 			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
 	KEYWORDS="~amd64 ~x86"
@@ -34,7 +34,7 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="audit avahi +caps debug iscsi +libvirtd lvm +lxc +macvtap nfs \
+IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm +lxc +macvtap nfs \
 	nls numa openvz parted pcap phyp policykit python qemu rbd sasl \
 	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc"
 REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
@@ -44,7 +44,9 @@ REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 	uml? ( libvirtd )
 	vepa? ( macvtap )
 	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
+	xen? ( libvirtd )
+	virt-network? ( libvirtd )
+	firewalld? ( virt-network )"
 
 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
@@ -67,6 +69,7 @@ RDEPEND="sys-libs/readline
 	audit? ( sys-process/audit )
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	caps? ( sys-libs/libcap-ng )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
 	iscsi? ( sys-block/open-iscsi )
 	lxc? ( sys-power/pm-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
@@ -97,7 +100,9 @@ RDEPEND="sys-libs/readline
 		>=net-firewall/iptables-1.4.10
 		net-misc/radvd
 		net-firewall/ebtables
-		sys-apps/iproute2[-minimal] )
+		sys-apps/iproute2[-minimal]
+		firewalld? ( net-firewall/firewalld )
+	)
 	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
 # one? ( dev-libs/xmlrpc-c )
 DEPEND="${RDEPEND}
@@ -160,6 +165,7 @@ pkg_setup() {
 						LXC_CONFIG_CHECK+=" ~MEMCG"
 
 	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
 	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
 	use macvtap && CONFIG_CHECK+="${MACVTAP}"
 	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
@@ -194,11 +200,14 @@ src_prepare() {
 	local avahi_init=
 	local iscsi_init=
 	local rbd_init=
-	cp "${FILESDIR}/libvirtd.init-r10" "${S}/libvirtd.init"
+	local firewalld_init=
+	cp "${FILESDIR}/libvirtd.init-r11" "${S}/libvirtd.init"
 	use avahi && avahi_init='avahi-daemon'
 	use iscsi && iscsi_init='iscsid'
 	use rbd && rbd_init='ceph'
+	use firewalld && firewalld_init='need firewalld'
 
+	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
 	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
 	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
 	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
@@ -207,8 +216,6 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	myconf="${myconf} $(use_enable debug)"
-
 	## enable/disable daemon, otherwise client only utils
 	myconf="${myconf} $(use_with libvirtd)"
 
@@ -217,9 +224,12 @@ src_configure() {
 
 	## hypervisors on the local host
 	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	 # leave it automagic as it depends on the version of xen used.
-	use xen || myconf+=" --without-libxl"
-	use xen || myconf+=" --without-xenapi"
+	myconf+=" --without-xenapi"
+	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
+		myconf+=" --with-libxl"
+	else
+		myconf+=" --without-libxl"
+	fi
 	myconf="${myconf} $(use_with openvz)"
 	myconf="${myconf} $(use_with lxc)"
 	if use virtualbox && has_version app-emulation/virtualbox-ose; then
@@ -245,6 +255,7 @@ src_configure() {
 	myconf="${myconf} $(use_with numa numactl)"
 	myconf="${myconf} $(use_with numa numad)"
 	myconf="${myconf} $(use_with selinux)"
+	myconf="${myconf} $(use_with fuse)"
 
 	# udev for device support details
 	myconf="${myconf} $(use_with udev)"
@@ -260,6 +271,7 @@ src_configure() {
 	myconf="${myconf} $(use_with macvtap)"
 	myconf="${myconf} $(use_with pcap libpcap)"
 	myconf="${myconf} $(use_with vepa virtualport)"
+	myconf="${myconf} $(use_with firewalld)"
 
 	## other
 	myconf="${myconf} $(use_enable nls)"
@@ -286,9 +298,6 @@ src_configure() {
 	# locking support
 	myconf="${myconf} --without-sanlock"
 
-	# DBus access to iptables/ebtables and friends
-	myconf="${myconf} --without-firewalld"
-
 	# this is a nasty trick to work around the problem in bug
 	# #275073. The reason why we don't solve this properly is that
 	# it'll require us to rebuild autotools (and we don't really want
@@ -355,12 +364,16 @@ pkg_preinst() {
 	fi
 
 	# Only sysctl files ending in .conf work
-	mv "${D}"/etc/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
+	mv "${D}"/usr/lib/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
 }
 
 pkg_postinst() {
 	use python && python_mod_optimize libvirt.py
 
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
 	# support for dropped privileges
 	if use qemu; then
 		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"

app-emulation/virt-manager/Manifest

@@ -1,2 +1 @@
-DIST virt-manager-0.9.1.tar.gz 1942398 SHA256 15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a SHA512 d21f06e5f99a66318c58d78b8d61b6c590c5defc5eccb2d2f6b4182d1883e02a095ad7b44bef0c6c0cd32919b6670b5c41ee3c5b5d44cc592bcdd56e73f19801 WHIRLPOOL 191fda27f3e99cf38ecbc673b26be3d0aa38b0e88777f73798f6444a6463b66fba1345304af3ee2344eb31de2a34f57e48108d6191d94eb251ea0b006cf79cab
 DIST virt-manager-0.9.4.tar.gz 1709809 SHA256 dc8c553beeb15bb30cd5517b2105bcc47cf482b03523e522733c52b0e5df0fc0 SHA512 f70f4c4f0d5b282d8126e495a2da8bcb6afe0bcbbae493d4abb46c3a1802f5ce36f477125421cb577ab2f64bae522db4d7c03558fa7997d74f5060b29b98c53a WHIRLPOOL 00a213515f23858278f47069102cf82eb053255b81a9e128fd666dbb17f6d9e7ce2365b4370fa3b733406c07599fe5c0dfa076a6555c48dd62d1178b679acedb

app-emulation/virt-manager/virt-manager-0.9.1.ebuild

@@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.1.ebuild,v 1.5 2012/05/31 23:41:58 zmedico Exp $
-
-EAPI=4
-
-#BACKPORTS=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git"
-fi
-
-PYTHON_DEPEND="2:2.5"
-
-# Stop gnome2.eclass from doing stuff on USE=debug
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2 autotools
-	SRC_URI=""
-	KEYWORDS=""
-	VIRTINSTDEP=">=app-emulation/virtinst-9999"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="amd64 x86"
-	VIRTINSTDEP=">=app-emulation/virtinst-0.600.1"
-fi
-
-DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
-HOMEPAGE="http://virt-manager.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring policykit sasl spice"
-RDEPEND=">=dev-python/pygtk-1.99.12
-	>=app-emulation/libvirt-0.7.0[python,sasl?]
-	>=dev-libs/libxml2-2.6.23[python]
-	${VIRTINSTDEP}
-	>=gnome-base/librsvg-2
-	>=x11-libs/vte-0.12.2:0[python]
-	>=net-libs/gtk-vnc-0.3.8[python,sasl?]
-	>=dev-python/dbus-python-0.61
-	>=dev-python/gconf-python-1.99.11
-	dev-python/urlgrabber
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	policykit? ( sys-auth/polkit )
-	spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )"
-#	tui? ( >=dev-python/new_syrup-0.1.2 )"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	dev-util/intltool"
-
-pkg_setup() {
-	G2CONF="--without-tui"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/python/python2/" -i src/virt-manager.in || \
-		die "python2 update failed"
-
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-		# virt-manager's autogen.sh touches this and eautoreconf fails
-		# unless we do this
-		touch config.rpath
-
-		rm -rf config.status || die
-		intltoolize --automake --copy --force || die
-		perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in || die
-		perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \
-			po/Makefile.in.in || die
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-	gnome2_pkg_postrm
-}

app-emulation/virt-manager/virt-manager-0.9.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.4 2012/12/06 04:26:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.5 2013/03/24 00:40:35 cardoe Exp $
 
 EAPI=4
 
@@ -44,6 +44,7 @@ RDEPEND=">=dev-python/pygtk-1.99.12
 	>=dev-python/dbus-python-0.61
 	>=dev-python/gconf-python-1.99.11
 	dev-python/urlgrabber
+	sys-apps/dbus[X]
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 	policykit? ( sys-auth/polkit )
 	spice? (

app-emulation/virtinst/Manifest

@@ -1,3 +1 @@
-DIST virtinst-0.600.0.tar.gz 576764 SHA256 92dc8f14d31ffb0e79479fab982203027c45c83d25e73af7627f589f92ca797a SHA512 db7858aa97aef8bbd406473369107e4d588e4d6ffc893c2bf98dabe23eb4a91f61044a0b26d30b55c5ac1088309d28cbb1e76d70f1c674a6a720e6609f858e6e WHIRLPOOL ed06cc8be02fab70f686016747898d59c5d74f343936105f279a406c39227f3e68098f0f3bfa0ebc2dabde046ffbde16f1ecc6876b3497707487a660695e652a
-DIST virtinst-0.600.1.tar.gz 8122159 SHA256 db342cf93aae1f23df02001bdb0b0cc2c5bf675dca37b4417f5a79bf5a374716 SHA512 f51f4f497492278e6de20e70bb2eec1d0219ec5f33894883a70e6df91f2ff31805fef8745dea9822eb78e051986d37d09b0638eed8705d77a1e2c04e5c70045a WHIRLPOOL ba44a662eb66b94b1e7e4fd377a484884aca5b50bfd22bc3fa4522adf465f7de2b5154a9dec6d1f452383bfe77fd28c6d2f741cffe7385b1bfbc4c94d0e8a2a3
 DIST virtinst-0.600.3.tar.gz 8174690 SHA256 e41efad3e3c798129af0cec92c1abd6c7e209b5dd4d311acdef0fc1a2daf5006 SHA512 fdb51919cd24bd83857c6a078bbc2469a184b98966da4afc1e2b4f39d570b570bd2d408c233e7049e8f7d57f137426d361496d349afff9c7dde6833fb5790332 WHIRLPOOL 518c99e1447e6fea700172892326a8bd628f4e7bbffcc990616d5fde119cfa1b8f1d718d3bdaabbd0e3a577466866645d8b69755370c9d42f8bab0f1643cbdb2

app-emulation/virtinst/virtinst-0.600.0.ebuild

@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.0.ebuild,v 1.4 2012/01/28 15:25:29 phajdan.jr Exp $
-
-#BACKPORTS=1
-
-EAPI=3
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="http://git.fedorahosted.org/git/python-virtinst.git"
-	GIT_ECLASS="git-2"
-fi
-
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz
-		${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Python modules for starting virtualized guest installations"
-HOMEPAGE="http://virt-manager.et.redhat.com/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-RDEPEND=">=app-emulation/libvirt-0.7.0[python]
-	dev-python/urlgrabber
-	dev-libs/libxml2[python]"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="virtconv virtinst"
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-		epatch
-
-	distutils_src_prepare
-}

app-emulation/virtinst/virtinst-0.600.1.ebuild

@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.1.ebuild,v 1.3 2012/03/24 17:11:35 phajdan.jr Exp $
-
-#BACKPORTS=2
-
-EAPI=3
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="http://git.fedorahosted.org/git/python-virtinst.git"
-	GIT_ECLASS="git-2"
-fi
-
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz
-		${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Python modules for starting virtualized guest installations"
-HOMEPAGE="http://virt-manager.et.redhat.com/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-RDEPEND=">=app-emulation/libvirt-0.7.0[python]
-	dev-python/urlgrabber
-	dev-libs/libxml2[python]"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="virtconv virtinst"
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-		epatch
-
-	distutils_src_prepare
-}

app-laptop/laptop-mode-tools/Manifest

@@ -1,2 +1,3 @@
 DIST laptop-mode-tools_1.60.tar.gz 104415 SHA256 39246db1bba2ea12c7ee6f1979f914a803a9f70836cde687ff9c3a39bc9c9519 SHA512 79596bb24b2af8bbeb3424eeff51022bb381609325a0eb5c009e0970dffe055d2493509d56a4e2c8f745c27f03bc176372d9b27e3a0a050f7bc1c58f86aae5c9 WHIRLPOOL 819cd4ad40c9e2a74bc07f70986c985b4128828ed508d808097472ee301ca788567b65d86717552a8191b378d595cb41b922a9e2f5a2fbcacf645acfe607d0ec
 DIST laptop-mode-tools_1.62.tar.gz 105941 SHA256 d40b3d2fb4dc120b4a427ef7dbddc9dd4d9ea0c475685538d36d3457b39158cd SHA512 3ba2a8db860349c5766f5282ca6f70f3bb780cb44e8674beb7e9c5783e96fc07a144245cc50414fef61b1cd6e08a2096667806792c2853cbcc9c83eb7d796b1a WHIRLPOOL 232115a3a6599241892abcc3f64db8bfa1c897bebbc22c198ce58bcb6bb3dd99aa3fb143c07f69fd6e6099b76da9c494423def0c86c8eeb3b610f9f3e51c0505
+DIST laptop-mode-tools_1.63.tar.gz 107339 SHA256 04b9bf8cce4172a810ce4026e75e0e7bfd0e05e456bbf3f13b8e9b4178d2c65b SHA512 41e48483883556541e3c5882cff2b029395d1814902d979b36e3db66385dcb22821d99ab2d0720b24b48c23afe02c94692d6222afd268a38063a1bb2bfe4c87a WHIRLPOOL 4d2b26fbe66cfa706ad660800936f2d795e493234b9154e3267db81bd476e5cb0b2f9c528d0df895238ea1ce618e2a3d87739ec5ae5dec367a787feb9dcedf79

app-laptop/laptop-mode-tools/laptop-mode-tools-1.63.ebuild

@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63.ebuild,v 1.1 2013/03/23 17:41:47 alonbl Exp $
+
+EAPI=5
+inherit eutils multilib systemd udev
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="http://www.samwel.tk/laptop_mode/"
+SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi apm bluetooth scsi systemd"
+
+RDEPEND="net-wireless/wireless-tools
+	sys-apps/ethtool
+	sys-apps/hdparm
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez:= )
+	scsi? ( sys-apps/sdparm )
+	systemd? ( sys-apps/systemd )"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# This should avoid conflict with pm-powersave wrt #327443 and #396703
+	cat <<-EOF > "${T}"/${PN}
+	HOOK_BLACKLIST="00powersave"
+	EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		LIB_D="/usr/$(get_libdir)" \
+		UDEV_D="$(udev_get_udevdir)" \
+		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
+		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		SYSTEMD="$(use systemd && echo yes || echo no)" \
+		sh ./install.sh || die
+
+	dodoc Documentation/*.txt README
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# See src_prepare()
+	insinto /etc/pm/config.d
+	doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+	if use acpi || use apm; then
+		if use acpi; then
+			daemon_name="acpid"
+		elif use apm; then
+			deamon_name="apmd"
+		fi
+		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+			ewarn "To enable automatic power state event handling,"
+			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+			ewarn "added to default runlevel:"
+			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+				ewarn "# rc-update add laptop_mode default"
+			fi
+			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+				ewarn "# rc-update add ${daemon_name} default"
+			fi
+		fi
+	else
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+		ewarn "information."
+		ewarn
+	fi
+}

app-misc/secure-delete/Manifest

@@ -1 +0,0 @@
-DIST secure_delete-3.1.tar.gz 62073 SHA256 a9d846d1dce3f1bdf13bbb306e8596bc1f263198a086f6beecd90ccf7bddf8d5 SHA512 9e7ae1458ffcce53fac23cf9b8df673d0754e6c3ff7791c445f2290dfa04f01fd2eda8b7c5d0045883159a32438783c380f770d7277ca77c9642c68e8f42dd07 WHIRLPOOL 5f9f17989a5e3aa1ef40ad13d2bc7f58cf8877ab4bb9a679a5550e911416374bf23343993eaad7ac41a41741954d7b65c1d969ec52a910297d0b2841f156dc2a

app-misc/secure-delete/files/secure-delete-3.1-do-not-use-the-kernel-module.patch

@@ -1,41 +0,0 @@
---- Makefile.old	2006-03-08 14:59:53.000000000 -0500
-+++ Makefile	2006-03-08 15:00:23.000000000 -0500
-@@ -7,7 +7,7 @@
- OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2
- #LD_MOD=-r
- 
--all: sdel-lib.o srm sfill sswap smem sdel-mod.o
-+all: sdel-lib.o srm sfill sswap smem 
- 	@echo
- 	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
- 	@echo "having fun."
-@@ -15,9 +15,6 @@
- 	@echo "I hope YOU have fun!"
- 	@echo
- 
--sdel-mod.o: sdel-mod.c
--	$(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c
--
- sdel-lib.o: sdel-lib.c
- 	$(CC) ${OPT} -c sdel-lib.c
- 
-@@ -35,7 +32,7 @@
- 	-strip smem
- 
- clean:
--	rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~
-+	rm -f sfill srm sswap smem sdel sdel-lib.o 
- 
- install: all
- 	mkdir -p -m 755 ${INSTALL_DIR} 2> /dev/null
-@@ -47,8 +44,8 @@
- 	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
- 	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
- 	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}
--	-test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char
--#	@-test '!' -e sdel-mod.o -a `uname -s` = 'Linux' && echo "type \"make sdel-mod install\" to compile and install the Linux loadable kernel module for secure delete"
-+	-test -e 
-+#	@-test '!' -e 
- 	@echo
- 	@echo "If men could get pregnant, abortion would be a sacrament."
- 	@echo

app-misc/secure-delete/files/secure-delete-3.1-makefile.patch

@@ -1,25 +0,0 @@
---- Makefile	2010-08-10 10:44:37.000000000 -0400
-+++ Makefile.secure	2010-08-10 10:44:43.000000000 -0400
-@@ -18,14 +19,14 @@
- sdel-lib.o: sdel-lib.c
- 	$(CC) ${OPT} -c sdel-lib.c
- 
--srm: srm.c
--	$(CC) ${OPT} -o srm srm.c sdel-lib.o
--sfill: sfill.c
--	$(CC) ${OPT} -o sfill sfill.c sdel-lib.o
--sswap: sswap.c
--	$(CC) ${OPT} -o sswap sswap.c sdel-lib.o
--smem: smem.c
--	$(CC) ${OPT} -o smem smem.c sdel-lib.o
-+srm: srm.o sdel-lib.o
-+	$(CC) $(LDFLAGS) srm.o sdel-lib.o -o srm
-+sfill: sfill.o sdel-lib.o
-+	$(CC) $(LDFLAGS) sfill.o sdel-lib.o -o sfill
-+sswap: sswap.o sdel-lib.o
-+	$(CC) $(LDFLAGS) sswap.o sdel-lib.o -o sswap
-+smem: smem.o sdel-lib.o
-+	$(CC) $(LDFLAGS) smem.o sdel-lib.o -o smem
- 
- clean:
- 	rm -f sfill srm sswap smem sdel sdel-lib.o 

app-misc/secure-delete/metadata.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
-</pkgmetadata>

app-misc/secure-delete/secure-delete-3.1-r1.ebuild

@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/secure-delete-3.1-r1.ebuild,v 1.1 2010/08/10 19:09:54 hwoarang Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P=${PN//-/_}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Secure file/disk/swap/memory erasure utilities"
-HOMEPAGE="http://www.thc.org/"
-SRC_URI="http://www.thc.org/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!app-misc/srm"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	chmod u+w .
-
-	sed -i \
-		-e 's|mktemp|mkstemp|g' \
-		sfill.c
-
-	sed -i -e "/strip/d" Makefile
-
-	# the kernel module will not compile without smp support and there is no
-	# good way to ensure that a user has it
-	epatch "${FILESDIR}"/${PN}-3.1-do-not-use-the-kernel-module.patch \
-		"${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	append-flags "-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake \
-		INSTALL_DIR="${D}"/usr/bin \
-		MAN_DIR="${D}"/usr/share/man \
-		DOC_DIR="${D}"/usr/share/doc/${PF} \
-		install || die "emake install failed"
-
-	dodoc secure_delete.doc usenix6-gutmann.doc || die
-}
-
-pkg_postinst() {
-	ewarn "sfill and srm are useless on journaling filesystems,"
-	ewarn "such as reiserfs or XFS."
-	ewarn "See documentation for more information."
-
-	elog "The kernel module has been removed since it does not compile"
-	elog "for non-smp kernels."
-}

app-misc/secure-delete/secure-delete-3.1.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/secure-delete-3.1.ebuild,v 1.9 2008/12/30 20:20:14 angelos Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN//-/_}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Secure file/disk/swap/memory erasure utilities"
-HOMEPAGE="http://www.thc.org/"
-SRC_URI="http://www.thc.org/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!app-misc/srm"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	chmod u+w .
-
-	sed -i \
-		-e 's|mktemp|mkstemp|g' \
-		sfill.c
-
-	sed -i -e "/strip/d" Makefile
-
-	# the kernel module will not compile without smp support and there is no
-	# good way to ensure that a user has it
-	epatch "${FILESDIR}"/${PN}-3.1-do-not-use-the-kernel-module.patch
-}
-
-src_compile() {
-	emake -j1 OPT="${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
-		CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake \
-		INSTALL_DIR="${D}"/usr/bin \
-		MAN_DIR="${D}"/usr/share/man \
-		DOC_DIR="${D}"/usr/share/doc/${PF} \
-		install || die "emake install failed"
-
-	dodoc secure_delete.doc usenix6-gutmann.doc
-}
-
-pkg_postinst() {
-	ewarn "sfill and srm are useless on journaling filesystems,"
-	ewarn "such as reiserfs or XFS."
-	ewarn "See documentation for more information."
-
-	elog "The kernel module has been removed since it does not compile"
-	elog "for non-smp kernels."
-}

app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild,v 1.1 2013/03/23 10:17:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild,v 1.2 2013/03/24 08:35:08 scarabeus Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ OFFICE_EXTENSIONS=(
 	"09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_${PV}.oxt"
 	"b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_${PV}.oxt"
 )
-URI_EXTENSIONS="${OO_EXTENSIONS[@]/#/http://ooo.itc.hu/oxygenoffice/download/libreoffice/}"
+URI_EXTENSIONS="${OFFICE_EXTENSIONS[@]/#/http://ooo.itc.hu/oxygenoffice/download/libreoffice/}"
 
 inherit office-ext-r1
 

app-text/cuneiform/metadata.xml

@@ -6,6 +6,10 @@
 	  <email>yaleks@gentoo.ru</email>
 	  <name>Aleksandr Yakimov</name>
 	</maintainer>
+	<maintainer>
+	  <email>rich0@gentoo.org></email>
+	  <name>Richard Freeman</name>
+	</maintainer>
 	<longdescription lang="en">
 		Cuneiform is an multi-language OCR system.
 	</longdescription>

app-text/qpdf/qpdf-4.0.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-4.0.1.ebuild,v 1.1 2013/01/19 00:25:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-4.0.1.ebuild,v 1.2 2013/03/24 10:33:31 grobian Exp $
 
 EAPI="5"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0/10" # subslot = libqpdf soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
 IUSE="doc examples static-libs test"
 
 RDEPEND="dev-libs/libpcre

app-text/yagf/metadata.xml

@@ -23,4 +23,8 @@
 		YAGF also provides some facilities for a multi-page recognition (see
 		the online help for more details).
 	</longdescription>
+	<use>
+		<flag name='cuneiform'>Enable support for the <pkg>app-text/cuneiform</pkg> OCR engine.</flag>
+		<flag name='tesseract'>Enable support for the <pkg>app-text/tesseract</pkg> OCR engine.</flag>
+	</use>
 </pkgmetadata>

app-text/yagf/yagf-0.9.2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/yagf-0.9.2.ebuild,v 1.5 2013/03/22 22:56:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/yagf-0.9.2.ebuild,v 1.7 2013/03/24 15:39:45 hwoarang Exp $
 
 EAPI="5"
 
@@ -15,12 +15,15 @@ SRC_URI="http://symmetrica.net/cuneiform-linux/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="scanner pdf"
+IUSE="scanner cuneiform +tesseract pdf"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
 
 DEPEND=">=dev-qt/qtgui-4.7:4
 	app-text/aspell"
 RDEPEND="${DEPEND}
-	app-text/tesseract
+	cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
 	scanner? ( media-gfx/xsane )
 	pdf? ( || ( app-text/poppler[utils] app-text/ghostscript-gpl ) )"
 

dev-java/icedtea-bin/Manifest

@@ -1,44 +1,32 @@
-DIST icedtea-bin-core-6.1.11.5-amd64.tar.bz2 32980753 SHA256 ca12b761f7c299e7485ead654ce640ecec3e311c342cc8d07f8dfa9e8d4cce16 SHA512 8cdd8256fd432ce7a01775908789953bfdad6b2b944afb42282e258e0bba92b29f6f44190e8911a52a909acd07ed5fd07547e808184129e39314310290703ac3 WHIRLPOOL 3fe1dfe6de3ca5ee5d55fe7cada0bfbd0edcb9e43d1ea90a3c271dd29ecb3ddddf99c564c8416af207897e55af103e2d9c6cc9cf373ea94bf669013b4e24e73e
-DIST icedtea-bin-core-6.1.11.5-x86.tar.bz2 33919404 SHA256 bd086dbf01347fcf88a0217278e3c1a30178f596f8a0e49b5b2e7f4b24ddb7d9 SHA512 b2b42639cda25d3bb49d2383c99c65994e99c976cbc0a1094153ed34b0b95a71bba597dc41fb71ab83dcca5dfb144d347efb90f7ba0db6f443d1b5a87c60848b WHIRLPOOL 454ab0b6ec212aee75e3d4bbef299eb4cb4efd39e527502c63407bbab5559c2a6dbee8e9260ada9e6ab175646002e762704514540ac69dc829f49f3ff9701671
 DIST icedtea-bin-core-6.1.12.2-amd64.tar.bz2 38338494 SHA256 149975fd7de997a5cf95c0e78ae56573ed2bf341285899112fce85242e92107a SHA512 298172cfb859e39d9f00c757c9aa9a8423c23cf87f2adf5ce3f0837244089cfaa32c1146087f96fac64c0a4a7bc6eb89bf4c6e07e73e5bd273c54720762593bd WHIRLPOOL 8ca4033763b339fd357ede0a2b0c7cb205c67fdba489cb966c4b93ac226da7c7df5d1833fe2690d3aa076815f86b36d7b6e1ed3fd628bbe3a4a99c3e7214f54e
 DIST icedtea-bin-core-6.1.12.2-x86.tar.bz2 39106978 SHA256 9d84884320359ea733f600c10f34dd4ba6f4473867f5e17eeca2b08d33c2f176 SHA512 8280d474897f93ebb03cd1906972e7c16893c21f94f7848df4e665add97817e21d3db7072a4d922ebd7713d1c79383953c5ca43d481cc6cd3be6959fd14461e5 WHIRLPOOL 48f316f466d4ca6e2f6ec26132416bbb0cc8451a832a9eb760a99b938674fea49881f9b3bfb75e5b3f7152a134b37354459b4bde32cfd5aa7f58a70d77dd6a8a
-DIST icedtea-bin-core-7.2.3.3-amd64.tar.bz2 48848494 SHA256 3cfdd8d83190892a1540e84daa3c7e454889e151537e708737a413b10ede54ec SHA512 f7238cef43d725e33ec8e27a2ae13500eff2446d393e3704c5c7beb27ffad1bbc52cd13bbbb4ae527702aca56c9b7650a5076b387d760a7f6a0763b439c2a41c WHIRLPOOL eb95a76a9ef25e52f0cc64f2c16ad2d7d8758026cb4c627681b5841e35bc86614a7a9c5a6a6b4d710c4eac50972f9524780e54a65ec041e2fddc1a20c6108f8a
-DIST icedtea-bin-core-7.2.3.3-x86.tar.bz2 49962247 SHA256 d0ad8f8f1f74de7bef59a8284d23e63bb601ba369a86014303b33cf2abcf8bcd SHA512 84efff48a8d3eb5a3c749f7c806c90d1d02e672868dd27573c760ba85b149bbca8979d4a329110d07aa66980e3b33445e261b81554e756a3df802bdee4c61f25 WHIRLPOOL f236132ef0f6ba364789f4cbb6c4451869764028d34c078cb796ee142eb97c8c21ca0a0ff1ebf6410f9c96d0745de21e9dbab78bcf4b7d8c29b1e64fd8544019
-DIST icedtea-bin-core-7.2.3.4-amd64.tar.bz2 48853325 SHA256 89a367e81aaa627a632c35092be7c1089795d8c90f92c83803593ac7d9b01f07 SHA512 2c8b25bc8a4a017bdec06e8a49a14d724d900d08f77e0bfc7e39db5c66bbf17611741ebf6d58ee392afe69dda03eed78dee9c92deb46f832420ffdaf9d0a31f2 WHIRLPOOL 4e15a074cc1f0895ee78fac052b4d9e9b809cce73fa585499b09a051c0a8e11128afa21cfce9a6bd993479279036c270758b03e1cac6f5fa27ca9a26d41de535
-DIST icedtea-bin-core-7.2.3.4-x86.tar.bz2 49964720 SHA256 df223947302274db0f78c6d3f1ac7d751a06b8fc53051b3eeecbc13735de189e SHA512 6d15ba18be1541727ba61d75ea19a65726bff419caf99217f3c1a6f466f9281087f8268fb37c85d4643f96e114f3ec957e33984f922a466adb0678993a4b0add WHIRLPOOL b2a8e817aab965045cefae27da8975c7bfee1028c50a1e8f1e82d9b09ac28870c6f1e5399ddcc877e17951771a731b15a13fca6799d4dca6e9504f7ae9526569
+DIST icedtea-bin-core-6.1.12.4-amd64.tar.bz2 38328989 SHA256 734e076ae38e3b8d6f33fb52b6a97a50046bc28407e85c99c6c257e2c1a6a455 SHA512 1146e5386e328ab91c352b6027f0d5e3347eab6b3975a98b218f965a656aaebf0156b66a6e1c0a220e05c2305c6fd656e00d2949365801948772ae2f3412c087 WHIRLPOOL a316e6696a141edf0a9b1a248383087b25f299702a80ce084994e23ff30ae3c83ac84220635861b1c9ce4cfcd15976d307eb1fac0a52dc3237408e0369431143
+DIST icedtea-bin-core-6.1.12.4-x86.tar.bz2 39119517 SHA256 52ea87b0d5a4d3922cd84ba2cf5b44eb95afb7943af4943b6d038f8f4a923714 SHA512 f3063cd01e521acc22ef134e318f35d7e26dafd186b0d588c5bc678650f04d92a518143ca11ca4db032dc5e99954f415070b4171781fe2c7bae1a1f811b9a810 WHIRLPOOL 9e537a72266c50abce69739cd1fcde0215ee040cb3ddc06373eebfc4df5fb7bf07bb0cffb51517a57c686a07c86869180053148a18c34af57a7ff805a015d536
 DIST icedtea-bin-core-7.2.3.6-amd64.tar.bz2 48864185 SHA256 4eef39a8240f483bdbddd3d4b7b81af55c6d4f526336beb486526b2d5b0566a5 SHA512 ef720079aef99f547d857b986915236f0b0d35bd9812223b79892bbda953bdc185e12f8974959eda617e61d91f41ec374e174643c6764543db27075ab1e58289 WHIRLPOOL 6d2ed5ca5e3822e55baa5ac4a792c7a212fe8703e340161514bcde6c54e5dc613ae3ff959ecb3a975c54fb8541f9bc0926006f432c19a120db9e61ce8b07c7d3
 DIST icedtea-bin-core-7.2.3.6-x86.tar.bz2 49977550 SHA256 c4186639f5e295c3126e4bf8812a17d84fa4a76ab86cb8f0032066e1031a4f7f SHA512 ec9b8c9685ee3673d333dd82645e90ed29dd5417f2d2c12da27a47032ad2c5fde21afffb3399889e49a604bc54a65c4a1c2f4336539bee510dd1ce2f9b424507 WHIRLPOOL 5b78b0a69f5032c185409391b0a983b30fafe9fd5e231282193c2349dcb69437e4ea2f4aedee35e60a0d41c4905d815f379492c9c958db181adf59d5f89e05bd
-DIST icedtea-bin-doc-6.1.11.5.tar.bz2 11636975 SHA256 0b5dacb7c5873d58c31870090a641cd0df58424478eff2d72499d1af4db35ba3 SHA512 0ffb517a23ee0b9a3876ed7113e86377a16b6bdca6aafc02aa5eb1343ef3bb958c3c255ff0e0958619ac1ebf5c993239ea736ef07204148cdb62b2ce4d5f7569 WHIRLPOOL ef4c53462f666b5202c43d44533b1991406cddc6243f9c2ac60ca8f4634f6f6636caf55a7d49c66851c13a4067013075816bf3f30b72b51aa208dc62852b40e6
+DIST icedtea-bin-core-7.2.3.8-amd64.tar.bz2 48875986 SHA256 049aad03f7ebabbc5bcec8f7048fa1bcbfff2aa03b2f08cc3ee6bf583c3c31b9 SHA512 7b31cb80c44501541b33d307ed579c81eb0551eeeb2c18956fd741ef44f97479ac91bf1c6fdb5a26dbf0f4f19d7b95dc1a6fc98e5e1941377c1d3a5cee6afc63 WHIRLPOOL b4f0b60a0385333fd9ce7114c91469a58297bffb77ed418f2a10375b1cb062a031190b6ba9bc176644a12a3dfd7d71dae492c331effe98e4510944a4573993be
+DIST icedtea-bin-core-7.2.3.8-x86.tar.bz2 49985284 SHA256 810893988cf93e6235cf47a55bc09c62bc095c9433a20b44f8454ee35816f2df SHA512 b83be108e60a6b2ff2db6a7a8137c3832e32b9833e170d9704bd3cee53236d93a463522f28bf3b0f0e9248403cdd06b1c0f8ef5a5326f79a6f0dd9b11c561b50 WHIRLPOOL 65b632603748cfd44f61ef807fc0236fbdc60a3c99177752be79dd65684d11d292e92287c201d5303907783f426e4bd09f2c3e2155e2c82cb5f4cc39e39357a3
 DIST icedtea-bin-doc-6.1.12.2.tar.bz2 11637228 SHA256 f52d2775edecfd9a9ddfee2456185f8ee20a71f570779d2f680ce349012adb14 SHA512 e88a76d5160ca272b783bb7c52da60c89c1434f35a7bcd26eb1ea72a6bc2ccf18237e0af0c238c8b3b7db2764dcf9ebb741e82aa15084650564651320a571f3a WHIRLPOOL b8d34e5786368a908a235c8fed11e76121c630f38f0350775153c41fef356c4b7a65045c02ce00bdb7d085c380164c217ac1cdbd136dbf2dbbde30bb628efd5a
-DIST icedtea-bin-doc-7.2.3.3.tar.bz2 12533982 SHA256 9f251b1a743f75891ea771de4c6f3f1e250f221f600c59b481cc992ba908fb8a SHA512 cc658427f612c0434411774c47a1e500e56e927f9e77db0685bcdb1e763c6540b286f054f1d2a4f2aeb7db27d02a7e09dbf0b4c1a8fabd9297801ca8608ce006 WHIRLPOOL 31b6fcbfa988001ece3a1dc9dfde679169cf773660c3a5817143f504fb5906b09baa7220e0f4dcb7bccc7a9f84fd5639448b94085e26d040ac67b5811481880d
-DIST icedtea-bin-doc-7.2.3.4.tar.bz2 12535391 SHA256 a7e586bec57f5d29126b2ca4d89b192b33eb2991413e42e7e7f0c14afd922032 SHA512 93cd8559f5adfd0ddfa9b50d9a759ecad47a545b33554208a2ef0a32a454a437f1795146dfe7323dfe89ae02e8905145fd7e88daaa87f48f7ae6eab63b510db3 WHIRLPOOL f0d2f04c592c5bc72c1ffbb2b47cd911eb4ec1831ce63e81c21e1e087251d06fdca72851ce3c029ce8d935652466d13d72d148ec6fcf3b1c7d0675ee2ae1d7a8
+DIST icedtea-bin-doc-6.1.12.4.tar.bz2 11638477 SHA256 ff5ce6246d638907ec2fab4140aae69e849e8981696271a1d478b874c7a63675 SHA512 ef208db32e07bb43e11e2e3ddbfdb707959d4b41c0419611925ed3cc037f07045a2c15d3c013f2b54335d3bea37a9a62a2d9007ade660d7b9420dad51c7a79f8 WHIRLPOOL 8e2d854b94b64c74fed587d51518a0db4d50c0e565c33db5e8b77cc0f692fbe2332e014f0b14b562f9706a84ab7cd5eceaedbcc50f497b4cf753c9c874c5ef44
 DIST icedtea-bin-doc-7.2.3.6.tar.bz2 12536331 SHA256 2768a8e3d051caa91804773d6efe21e95a344f8105ca672d6572e586b9c113ac SHA512 91087a1631157ef945ddb88d3f3f1fb878b507902010b358384b608040ba21a629c7769bead67301240f260043ca79c59feddbadc1f8aaba7d83afce2fd0f805 WHIRLPOOL a73261bac84e007b0b7eb0d6f420b9c5bb8ff7a3c7c0681ce0616ce335552e7a4e7b17a7021a6eff11c0a4abd8df9416dd92ef1dc9bf3f95b5c1a415c55a541f
-DIST icedtea-bin-examples-6.1.11.5-amd64.tar.bz2 2164804 SHA256 ddfab3fed17111cd766592ed34a3846447a4ea2f779d173f3b7a8e2d0be02286 SHA512 659b32184cbb393cfe925382b8169d2afdd7a68b492aace19ca13e14b76498da042c5a8c0e4e1302098d5b0a7d735beda2d1e2035e43a29abed2d41f737f7726 WHIRLPOOL 13b7373d71fad319fffd1e1d3158f23dd643c4ad78c44c8c0ffe500dee4abbcabf2842a01441efd5625c390519e3c6676a8f912e9c1d4885bbe0bea9210edb8c
-DIST icedtea-bin-examples-6.1.11.5-x86.tar.bz2 2133703 SHA256 4f48a3aa286fc3083f2aaa7e3605bb85c26fea286acfcf800f49e685298593ee SHA512 c01e3b6c323f5ad9163bcd1d27f07cce66cf72f54bc5a2c93240bb7e53a48137fddd9ceab82413aef6781fe1ff79019bb87f2fdecd25a5df685cca9f89957392 WHIRLPOOL 1976e26e211dfa12c30063f2951d91d90c15ead0d1897fcf636451b0f024feff2d691b0f96e440284d7c0d5291af976bae77d4a5c5258c77904f9084302f64f5
+DIST icedtea-bin-doc-7.2.3.8.tar.bz2 12533719 SHA256 451468c54141ddc498d938d0bb0da20b3ebc53084219c2458537d5a22cbd3261 SHA512 62c6ff06d65d1585693f3e7fa01d1dfc3ff61056ace745c650bec0fabc50e80db01c352bd53b3f838ce633bb2450d994f103eb1244faf027be6c6cda38ab0bc6 WHIRLPOOL 5c2330beb1091992f4fb40501b7da0ad4877b78bcba59bfd70e7a640a75221746d951c6001483858085bc7a704f4546b9d03b8d4a5ecf6627f7144f00a207faf
 DIST icedtea-bin-examples-6.1.12.2-amd64.tar.bz2 2164728 SHA256 a4231664ede197ad64a27cf0841c261a544da25afc97de4c3f43950a019e15b1 SHA512 04f2bc75085021507fbd7034cc6d8caf6e67d66875846654fb37342e462eef3a4ea38f5876bebc126e5efbf897a6ed3de613396a3266f11af47be5e0324f000a WHIRLPOOL 5111d6692b4b4853127cee5b2062d6bd0f2aaf47883196f2e97789350ad73720341c387139c3ef4e16f3ea0ade374fcc8d2a20ef02e4aa821af970171260d081
 DIST icedtea-bin-examples-6.1.12.2-x86.tar.bz2 2133662 SHA256 fd20501dac712facf6443273057e7a67a5f849183620243695b4653494ec648f SHA512 ee9376e252cafa3a6be25c38a66f56a25442d2cba24967a44bbe529be7d7c36c1e928d8bacc26d9aecd292824673084d9d5a1dbdbeaf207aaf4176223d4c7c7d WHIRLPOOL 428e8165035929e6b1a9c393114aadb49924513746317aa1e496fc762624cb7f7d4a7f64fb52c94ae1e6f9a66d096b35abe1d89e0fc69b4dcf4043aaba5034f5
-DIST icedtea-bin-examples-7.2.3.3-amd64.tar.bz2 2334417 SHA256 f02e6492f9dbfcf70e04b6fa4ef1e0d883c7e3751f16f6dd2c734ce981880124 SHA512 1585e22d5f87446e1c937d6e012025adc39b737bba81aebb52b0ec996e00d8fa20faeda37158f12fe55bfbdf8bdb64539719aabd8f2439112a8e67e17f0e311b WHIRLPOOL a2ef26ee0101249c93ce332742485feaa2df32cdd6ffbf5506ef163f75cb3bb7c28b605350c3b2c15a9a8ac5deacecf0ada4e90099b47bb058e34514faa494c1
-DIST icedtea-bin-examples-7.2.3.3-x86.tar.bz2 2313601 SHA256 61ef2242b646235006bc06451c9620d11b289e4a857286ae20283330545d919b SHA512 77af4a58cbb0a120c898a7cdeec30b4b1f55a74479cdab7801ab274814e5546d2dd2b8c154aedd70edd4aa226eb83538fd23a9fa16481303fc039fe5f5866201 WHIRLPOOL 432d82f02331225d6b70e17676f7fb989e290e915a18db7bf363ec1a35e60a6e470db369632eaeb1b9d8194ae488a49ff9665680d1a949ee94763dd1e0d6e1fd
-DIST icedtea-bin-examples-7.2.3.4-amd64.tar.bz2 2334377 SHA256 42d6cb0deb2402a7faf26efee6b6dfae4439d74d04db57252a3f38f71c93ac21 SHA512 5b9d26726ee5279f927ada923356b3799ae4f8750bf6c61b03333d19b543d406617756a76d2717283ab629a85a29cea01a6382e0a03520bd9e3c2bf8ffaa7813 WHIRLPOOL 646769aa2207ae87db6b446d0c6f9b3fee5299357ded72f2889587c949eaafd1d25d4dd2c0cbf018ce02eb995cb9948407505432159ec7545b21d7d40b6d6e18
-DIST icedtea-bin-examples-7.2.3.4-x86.tar.bz2 2314133 SHA256 3018b9c4552b2ef6b44491c8e6003bde75e497e626ec1abf81138c3dad4222a4 SHA512 f54901d8fab1fe8dbf1ce681e38be84e21db87b8b34f040aafefe4c51f7aa0efe8692a6f571a106200a576f7203c9f76b6cff8d0f9dc085e1fa5739f83a6f3c6 WHIRLPOOL 8617fddbd6083d17fd70357b064bb0c509b15ef3af42fc5e3a0170eb8fd765b78f265ffeab8f3ee6cad4f5fbdad58a7cf7c371ee9ead22786f13c40633f65f98
+DIST icedtea-bin-examples-6.1.12.4-amd64.tar.bz2 2164702 SHA256 c6961168cf00e8c8b56c5aa3de373099d8bceea1b91b482d5a36e28593947917 SHA512 c03c86acf0e3976e814a0a31adcfc3806dbf3ffb35b9a2d037a0bef98223f5e75c142e1baf80029ae7c5b9c41224c2b91893e0cf109d0b4f990d75afcb97249e WHIRLPOOL adff3d880e57856bcccb48f85df0eadea2d9173f025c6cb9d743695f0e6060780821b54ab0ad0b7e557e45d5de36c0174e1cd10eba112aa0c14a8474f04e2e11
+DIST icedtea-bin-examples-6.1.12.4-x86.tar.bz2 2133737 SHA256 9e6b5098e0b05e006a71927a56ea9813235d0e5698c45fc03239b70724136735 SHA512 fb9f6d583683def59f6cc63746184345f50a51ae6c5567c014f925216cf7619571d11041e863461f36932b3c7f612bda5517749af1a09174ce39a26a9d4fc31e WHIRLPOOL 21595487e055844f21022ea803e9f6192976e1670b99019c1d2b6d7377bec479b785b755e3ea528e4984a8ad6fe340733a4b87e81f60d6048d6f16f0a0702b1a
 DIST icedtea-bin-examples-7.2.3.6-amd64.tar.bz2 2334184 SHA256 37f73707bea574e0e5623bb3ea2c796729460b4b4fb4ad3f1620a2d9d6e4cf18 SHA512 3275a1d295c516b367df6b766e93df95348afe8b3d8f18f7da9ca1cdd83fa7326f0afc8b57e1514c9ace55052de3772b392efc3938a72c39e0d8a9b6f35226ce WHIRLPOOL 503b59c4423f352c7f4a860f0da1f70dee0cd8198dd499c72f4d815fc26df96f1ac1851ac6e7b670cdace92f8b25c0b8c3bc2ef30e1d2e4aa7f5b71255b5e346
 DIST icedtea-bin-examples-7.2.3.6-x86.tar.bz2 2313989 SHA256 c97b482337e05a31ac79845f15c84c338da9f17d343d0d7904560e14c5138796 SHA512 4b0043f42f9f3ee7cf884160e90c12963cafcc9f064401f8ee8687576f57dd9512b9595af58abb10ec1501dd0001ebc36827e7126c5e6361a22d547deb0af7dc WHIRLPOOL 64d0285741428787aade56e70b5afd9832b866bae15a55dcad423ae4b6ca457f5e959d70cd96f22495a39a9fb43d50dff93664fcd8c2f6e112aaf228aa664a0e
-DIST icedtea-bin-nsplugin-6.1.11.5-amd64.tar.bz2 1008682 SHA256 92d960861834d3a8731e4a2f9589dcab4ba8c70e250b0deb63b96582ab33b731 SHA512 05cff934639baece960552938a0f52ac2cc0e5f14bd82ca9922b59870542e0a1d1d1e40a758aa5e77595ff7fad41d3bcf6ca368a9a097eb86fc2b5a424b89276 WHIRLPOOL e4994b44b3044deece2c36862500ffb15e19362e4aec0ad5a856cbb2006d55cedd554155e09153fc15f2c3431b0c90305a59521a256ce402a0e1af731cd98561
-DIST icedtea-bin-nsplugin-6.1.11.5-r1-amd64.tar.bz2 1013352 SHA256 3dd3e219228a3175b4a2f3e806b8aed12082a91ceb712816e860d4021e2d50a9 SHA512 7447db5197e1f57d7a28f7be9b5b6648f1925e430805ae528b5e650736e2b0907d759c07d06058a909c2ecf22827f10ef303f89dea76a57c76855dd02589156f WHIRLPOOL 21dc25df621a66bd494bcd74edf069b823ba7ddc5d07482fd50dbb4e6f8bfd2793441d0d0742f2363d84c50b3d7b83a270b1ed3968913fc27a863e0a4051d019
-DIST icedtea-bin-nsplugin-6.1.11.5-r1-x86.tar.bz2 1007184 SHA256 29a9964aea2c2f3ddeae8f63c03154489e09433014696e0d46ec637582f117e1 SHA512 ea3f690cfd6a974a99f902238beb661fae0506b89ea4cf4778574e4ca101a027780a387de8bad2b739bad8161cd2b7478e27a2d58a4716ca09e33674a772e667 WHIRLPOOL 0e5cf7213650f20d5d0ffaf135e92c2540b5edd6d99d241971ee05c55c59cc5150430df9b28cc6d9f3c9a5ca74a5bb5da06864733e61e792793b5d67ee5d1bfe
-DIST icedtea-bin-nsplugin-6.1.11.5-x86.tar.bz2 1002312 SHA256 bcab76c6e2cb2dd678650ff9505f018a0244c8f2333c1a3ef6bf4ea3acc5372d SHA512 373c9b74f92e2d3ecb68b3815ac999d7e5411078b3398fb71722a4ba6d9518ae96d686536c204f632e19dbe86e2bbd00e8d518b2c8fbb69aba19ce28ff646e57 WHIRLPOOL 09b992843154afdfefbed396746921c4585312f1e4efebf55c872f7a79edbf89452e3078e0ec6cf103a9c87762e1cdcf47fee3eacdc48543f92203df049c86a5
+DIST icedtea-bin-examples-7.2.3.8-amd64.tar.bz2 2334168 SHA256 f67f8ca7ee887d962df8251ba715f576cdbc07d035b79778b7d610580c194256 SHA512 2d539f9c5ddd8b47d9632fd0a108cf820ba8a2e42afe2228379b7b9bb236aaa40bb151884d7674b0753e86746ce9c2484b3272a4e8a549edc9ffcc8b1c609664 WHIRLPOOL 1476fbe954ff4a3660603f4b4358d3bbdbc866464fb79be22628f982c8ec9c46a2e18ca339ad0486fd44e255c72d2edf268d115d194764bebad52b2aa2d863ec
+DIST icedtea-bin-examples-7.2.3.8-x86.tar.bz2 2313715 SHA256 73b8cfe118a1bc1fbbabe1c4eecf3d2fe8c7895ca42be53f0db6597c00650e7c SHA512 10800a350f9469ae495ad6a27002230c09675eda46809048f9da090ef7cce34af62b98f668c0127057e07bbf7ed8f31632f2a9ba00c98f509f3b77dbfd27675b WHIRLPOOL 72d12aaf5fe0e8aa5c9a9977225668c9421fe2aa155f10ac81d947290ad2556e67a1f14ce993b290e8d55d5a216363a339933fc5b85398ffb8707a8997ec310f
 DIST icedtea-bin-nsplugin-6.1.12.2-amd64.tar.bz2 1013050 SHA256 e26d916a134f4d66dc6366964f1ff5c200b749b58297fb5ce47cb2a6b354b9bf SHA512 96c1eb4bdccd1219d64aba6741cf935f1ddb4b3ef688ca8994e16d4b0f4a6b0047426e5ccafc51ebaa04a94b6f75024d754c0b1962762378d433089075c58c3a WHIRLPOOL a61346bfabceead6ce066eba16003d4a8cb8ad6748a1123f56983df87f17742d2e3ec427a5f9150d060af8e92008037aa9f0539b6ebe616d8895fb4f011e5249
 DIST icedtea-bin-nsplugin-6.1.12.2-x86.tar.bz2 1007012 SHA256 dd16240400560333ee8148d2e63e533557890ee86f1ed0d8f8eb070943aa732d SHA512 1bf98836446c5c3036658185e80e529d05caa10ea69354ce1fef3b61cd88b1d169c6cb26ad9ff401e8b176c2267f555029224d252646c2e21511077e827889c3 WHIRLPOOL 59e782dfde583a9b7c260ec89acf1252acc3abfa6a788e5f5f850d63e0fd9fb34969b445cc042f0c9614161c910c9f5f4a84a069dcac3810f0793fa017e25901
-DIST icedtea-bin-nsplugin-7.2.3.3-amd64.tar.bz2 1042904 SHA256 f3d3b9547260a992b281f19757e2102fe5d635f6785c22d582b5baebcedfccef SHA512 5afb8e775890fd09da3f4394aa17636b6121bd2066d09de508256f1bd6020a58d672ba72351fa71c18a57b9aa0aefbd0b6f7b407dd736181bfd02adcf7a79577 WHIRLPOOL 2ae06ff8702fd276836f5f7b8abc772984fb2628ae2ed265caa089d36b1bf6d22a3116cb6e8db22e8a30d410472156c1fb76d7179733ca33d6b3b2c9a87d858d
-DIST icedtea-bin-nsplugin-7.2.3.3-r1-amd64.tar.bz2 1048025 SHA256 344e9229d62326d28e176ef1dfa2ac8c82e9d11045e45a6e984e037aa91bd403 SHA512 c75d4763662c6fdfbfc7bbc4170c8c790e47d4e61c386a99f245440a1c9f3193e40aabc688c10b9540c615cd90abd34d25d0c45b54390bcd307c27159f413937 WHIRLPOOL a660f6c92484c7845d985618aec40e41addc9328408f249148353074e5af75f179e69f3395c58f82f6094b1fde56f8a584c95ef8b85882e705c38efe1a01063c
-DIST icedtea-bin-nsplugin-7.2.3.3-r1-x86.tar.bz2 1041691 SHA256 cb71e282b902c8012c49edc2d645980586334b0d34ad718b0f8f637dca3bb02b SHA512 03d6921945001370da18f12fcb1d09e0b3188cab2dfae9e215f74398b2f1f8e4a4acc3fae40e88338fc48b818cd431203ed0123813affb99d84a88c8144e8239 WHIRLPOOL 933ce65adee634cd4b176c38119d68aa079ef69faf64c70dab7cb65e35b3a3c8d738ed82c0e12114258a85c7481cc1aafe3c06a57452e03dea8dca1b3eb9feb0
-DIST icedtea-bin-nsplugin-7.2.3.3-x86.tar.bz2 1036471 SHA256 f5bfe521cfe7a88f3d51f38c71e3fdf2bdb36f584f3dc792cb4fd92fc39d934e SHA512 bf5c1f9f6a6e918e096938889aff94d54eb8b0e7e89847475f6a4f4045d65b752ffeeea42040ba64ec057e091a704d6143b0e85d12a84ff0eed8bf52c1fbf78e WHIRLPOOL d331440494dd7f5ede97ccf2441617f6a05752363c395032f88675ee969a52ba79c47e6e13474ac191f17a4474060a66f6d1dd4292f791e6b9e32a3bfa24ac5f
-DIST icedtea-bin-nsplugin-7.2.3.4-amd64.tar.bz2 1048078 SHA256 e3ab61516f6c37872168e4937687f7d4dba194bb8c383141533e87f25dc43e5f SHA512 9dcad66c628aa1699968b9f1943a37ddd8555f630d6b85fb9fce6b1024cdd77d4de38d980ed8d57d3285cc25e0ff946db1bce0a1d25eea813e7c5b9e77e6992a WHIRLPOOL e1427a3a27ce4a440a4217a26e496daaa3935f2110b469e3037b47c47a31e05e0248c42b2e800924c2b64f11d5c778537596ad6574f0664acfef153ed78812ff
-DIST icedtea-bin-nsplugin-7.2.3.4-x86.tar.bz2 1041899 SHA256 9d4351ecc9a4b54b1049ffda9387d9d282b178df9c3a66256925f83a4bd8fec6 SHA512 18c3b530eb64311a304f4e1a23647106f0c8b51f3c275672df06d5643dacce5eaab0073e017259046571e02dc3314fbd1734e50c1495954682780b06f7325183 WHIRLPOOL a7e1b83d42309b1e6bb365930b0db01f601e5332e802ab9397cf0183e9ccf58570125a746b3fcfb9d463ed8341f41bce38e7338b0e96b025e1bac6edb93abd81
+DIST icedtea-bin-nsplugin-6.1.12.4-amd64.tar.bz2 1013413 SHA256 c1ea8e5368c6ad235253c925c46b25d1f57a9b4ee11d6446ceb2d28b65f60e38 SHA512 23885c6fc7b62bb0ce49065ebfa91140c1f0ae2e0359e8d486df366496150584ac1cd589a83f563df230d70ed69e01219cf08acd8cc224927c8634184d2e5e8a WHIRLPOOL 52bdec4a22fc979668adbc25313d1ec550588755b89979203d779d83b4a536b95c33f7e54522c9fc32960ec2fc9084da74a754e1f7e28caaeded9a6357fab0d9
+DIST icedtea-bin-nsplugin-6.1.12.4-x86.tar.bz2 1007668 SHA256 7846482795eeb3d0e27e28d0cc455cccaf1c1c00073c505dc43356d34ee1174d SHA512 11559b00b5cfcc46c69abebaeafd369b0af6b972354313c9d0becc184d9215cdad548ab8d0843bd375714ebb97405568db1659cd5824d967109987f326ff1728 WHIRLPOOL 6ba0d909f348a3aafd54f1036d2aaf88dd6cb4bc1324ac80958222d135fcbe7e69288acfbee8c51269690c85207fdc4d634240b35d710787ca89bfb5c19661e1
 DIST icedtea-bin-nsplugin-7.2.3.6-amd64.tar.bz2 1047827 SHA256 4f276591ddd39977719f9e6e9039b5d78c46c0ec17e62d1efe0424667721ec84 SHA512 ec0f4fb365226aaea78bffde7f7f3275c9f1466d38cf8a884142f994ae6f7eaf819f5640faff371876787599324d4ad54374790ab0787c438425c1c86bfdd43d WHIRLPOOL 653641b88c257f435d26990880159feca24ffd5c57ad88012064651562addfde05ff4d3a5e4d109edc4dd607af4d121fc6b7599cd43a415db7efaf56de20b3c6
 DIST icedtea-bin-nsplugin-7.2.3.6-x86.tar.bz2 1041670 SHA256 6c2664d1e71121b8bb9fbe04d1ccd248562dec69222621ce2dafe5faaf8877ff SHA512 5ddcabb3b72771d849feb59e583167134be0432ffab9bf1ac52ab27c4bf74716fa6b8e5f6af0706b9cfe853a3953d2a710f1aaf3a609af843659d98c3fdbf257 WHIRLPOOL 51239e47da164b5d73822e851f1d8a739167a54caf226c7e2e519e2ee8906c0ef82dfff873773b2f17b361801646f9c7b38bbfd162ece3c8ad35da268589d00f
-DIST icedtea-bin-src-6.1.11.5.tar.bz2 40863162 SHA256 f6108917d2fdfcf201f991fde861df8107978198dd37463f9d2a5e2d7d563074 SHA512 fc0e6a6cd4857abb7c757b14dcb77724e13df85151ef0bcb8f8013e58919f5d7f6ba7ee601e36f99f6f43eee83ac1c74ec567ea64daf7d2d706b60561340d793 WHIRLPOOL 02e7a60a374597561d35c9381872b046de6fb087d5a48dfb2de2097afe4222e1e004e02048229eda7c2561375ab9fbff78eaa193623b825c07158e52237b0290
+DIST icedtea-bin-nsplugin-7.2.3.8-amd64.tar.bz2 1047634 SHA256 197fe27b0a3b7d453d1d09c2b014b2754e591685f82c766270c773c7fe0a0b4c SHA512 f3a97142042ee5262a63268fdd9f5dec8c1f77c5463b5b95df79bd60375cabfa8f8c85ce49936df10727784907ed13453b017af7bc9d5197931772611470e919 WHIRLPOOL 48e05a1d5e1a7705582c51f19b71657b9bc9938b8d334a83db448a084a61807884b6611056b1adeb9985c0eede5fcef0215fd54df2e5486b3a03dd883e8b9f9d
+DIST icedtea-bin-nsplugin-7.2.3.8-x86.tar.bz2 1041825 SHA256 6b67af11145c4634ef883f2ad812bc8edc1b3c08ed3e425ac4f10ed322753aad SHA512 384db30ff64f39408ae2db08a41097136067af2d256a6b1f31fd803009bf66d61644298db6c713797bcf7fe1265023aebded746eb9f40276ab8c043867015707 WHIRLPOOL 4f02fe40865f06c989b915c3c63b48128e1a4ad080a0b5f451c14a4ee6e4df3fa0cf8b19302fcd64291923d88f11fb5dd386bda4604339c52fcbfe9a776f1587
 DIST icedtea-bin-src-6.1.12.2.tar.bz2 40875911 SHA256 137932402c4f94baa90f57af4108cc224e31c5a07c1fa4a201827e51e7c9b52b SHA512 6668a2ccffbb2090cf34df714027c5c191f6a1e31cc8d921643914153d9bb8b847791558156776a201c6e25d4166a65673234eb248afd5372204cfbc947a1081 WHIRLPOOL b105327201861f0fa00625b6a0c72551b4e56038b23ddbd0b2d428c782acba6accf7be83964da6e66ee320d8e1dc10ee291e4945d4f82363b8e1739544e3781f
-DIST icedtea-bin-src-7.2.3.3.tar.bz2 41285893 SHA256 d781856b75d062480db486945c3a8408078a3a0ef80fe58dae6ac3dc9fa65abb SHA512 0d08e9282fe9e5ca1ae4ce8d866ee85d49f8d53f8c8dca6fe7fc198fb74fd28b6ec84ec8ca74c78d8da8a764c62ab544769cc5b1afa305edbcaad702a956e4c8 WHIRLPOOL 618218c213dce7ab6193c98d6b6fce481c66945aaefbe21cdc3ca8f8c791d8bfa20e40d939e0bbdd18aee8ae151bd0469777c71c96c1d038c635e94f94e84973
-DIST icedtea-bin-src-7.2.3.4.tar.bz2 41284713 SHA256 1830eaa0c8e91a13c6ba0a439f9735de53534ac5b6c5f0569d4cbc10d19607dc SHA512 8289c40d26fefb742fc5b85801286b7ab85f620ee5e2b5605dbc80a931bbcd0daa04ff04a9df3d8e9663bf85e8a33f1b37c7756ae0880de2d6a7e72813f9b24d WHIRLPOOL 873ecc60baecbef9eaacf3410637dd3debd3c5a6c04287e4654075a91cdfff8660148a47d9a88b208365b4dd6bcd810b64f0ad881db39f9f70309ad195397f06
+DIST icedtea-bin-src-6.1.12.4.tar.bz2 40882869 SHA256 162e4415be269073a38d85ce9894ff38b2bfdf1e1c4955f6d8155e09ec2e73ea SHA512 8c2b2a8d4ce3407d8dde4ad03614ad3f00dc29b6614e4ea2379e5ebdbdac92af8aa1e18b39c80f4acb63295950f18d9df13134510571710b8de7628923dc7f62 WHIRLPOOL c871041f4226ab888095abf3f5f7a9653e8a197defec98b70eb03a4e77d00bc9bab13f2b6bf331cc598ede62c059a6c412a928bc83d6b3670e562e9380ef95d6
 DIST icedtea-bin-src-7.2.3.6.tar.bz2 41274032 SHA256 b5b2b602e288fd87a83021216d29bdd7f5b72d07034c37836c1c24c2e2ddafd7 SHA512 76d97100d3294512439c681f65c04fc1f6813f6bfd91410f846a56ec76ac2f1b4dc5bf8d2a14ca02c98f8fd29d466ff22aeff9878d7a1a2d528f9ef3d90eeb41 WHIRLPOOL dea51019a5c7326b546805bf4f8712410e5d170cdd299ce900cb4e679bfa99e846743480a43ba78d84ad6462c117543d6ce0d9c312688626d7f30aa1c6928a43
+DIST icedtea-bin-src-7.2.3.8.tar.bz2 41281043 SHA256 8c4de067c5b37157442c8596e41bd5e2ecbe1f1063e1ad17fdcafd3176508ba2 SHA512 c2d2d4db98c99cc6c14aab1cfe82bf44579e9dd73e06a3ea5e395e86c2434b00414760cc4daadd537465b7b9152b78972d2c6aa3e281b365492e3d289ed60995 WHIRLPOOL cb6d31c89ed2dd5f93a363b05a6877ee17bfd309e3e8e78966f6d62b95460ee63053099554c01e59663571eb8f25cec6d8cf2b428126e8223c89341810be40d5

dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild

@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild,v 1.3 2012/10/31 14:24:22 nativemad Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PVR}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
-	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
-	examples? (
-		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
-	)
-	nsplugin? (
-		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
-	)
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="-* amd64 x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.4"
-X_COMMON_DEP="
-	dev-libs/glib
-	>=media-libs/freetype-2.3.9:2
-	>=x11-libs/gtk+-2.20.1:2
-	>=x11-libs/libX11-1.3
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXtst-1.1"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	>=media-libs/libpng-1.5
-	>=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg
-	nsplugin? (
-		>=dev-libs/atk-1.30.0
-		>=dev-libs/glib-2.20.5:2
-		>=dev-libs/nspr-4.8
-		>=x11-libs/cairo-1.8.8
-		>=x11-libs/pango-1.24.5
-
-	)"
-
-RDEPEND="${COMMON_DEP}
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# doins can't handle symlinks.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	# Remove on next bump as the needed marks are already set by icedtea ebuild.
-	java-vm_set-pax-markings "${ddest}"
-
-	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
-	if use doc; then
-		dohtml -r ../doc/html/*
-	fi
-
-	if use examples; then
-		cp -pRP share/{demo,sample} "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use nsplugin; then
-		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
-		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
-		docinto icedtea-web
-		dodoc ../doc/icedtea-web/*
-	fi
-
-	# Remove after next bump, handled by icedtea ebuild. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
-		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
-		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
-		elog "such as Firefox 3.5+ and recent Chromium versions."
-	fi
-}

dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.5-r1.ebuild,v 1.3 2012/12/03 20:48:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild,v 1.1 2013/03/24 13:27:12 caster Exp $
 
 EAPI="4"
 
@@ -28,7 +28,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 
 IUSE="+X +alsa cjk +cups doc examples nsplugin source"
 REQUIRED_USE="nsplugin? ( X )"

dev-java/icedtea-bin/icedtea-bin-7.2.3.3-r1.ebuild

@@ -1,142 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.3-r1.ebuild,v 1.1 2012/11/14 22:54:43 caster Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PVR}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
-	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
-	examples? (
-		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
-	)
-	nsplugin? (
-		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
-	)
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.4"
-X_COMMON_DEP="
-		>=dev-libs/atk-1.30.0
-		>=dev-libs/glib-2.20.5:2
-		>=media-libs/fontconfig-2.6.0-r2:1.0
-		>=media-libs/freetype-2.3.9:2
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.20.1:2
-		>=x11-libs/libX11-1.3
-		>=x11-libs/libXext-1.1
-		>=x11-libs/libXi-1.3
-		x11-libs/libXrender
-		>=x11-libs/libXtst-1.1
-	>=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	media-libs/lcms:2
-	>=media-libs/libpng-1.5
-	>=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# doins can't handle symlinks.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	# Remove on next bump as the needed marks are already set by icedtea ebuild.
-	java-vm_set-pax-markings "${ddest}"
-
-	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
-	if use doc; then
-		dohtml -r ../doc/html/*
-	fi
-
-	if use examples; then
-		cp -pRP share/{demo,sample} "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use nsplugin; then
-		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
-		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
-		docinto icedtea-web
-		dodoc ../doc/icedtea-web/*
-	fi
-
-	# Remove after next bump, handled by icedtea ebuild. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
-		elog "such as Firefox 3.5+ and recent Chromium versions."
-	fi
-}

dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild

@@ -1,142 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild,v 1.1 2012/10/20 21:47:49 caster Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PVR}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
-	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
-	examples? (
-		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
-	)
-	nsplugin? (
-		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
-	)
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.4"
-X_COMMON_DEP="
-		>=dev-libs/atk-1.30.0
-		>=dev-libs/glib-2.20.5:2
-		>=media-libs/fontconfig-2.6.0-r2:1.0
-		>=media-libs/freetype-2.3.9:2
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.20.1:2
-		>=x11-libs/libX11-1.3
-		>=x11-libs/libXext-1.1
-		>=x11-libs/libXi-1.3
-		x11-libs/libXrender
-		>=x11-libs/libXtst-1.1
-	>=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	media-libs/lcms:2
-	>=media-libs/libpng-1.5
-	>=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# doins can't handle symlinks.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	# Remove on next bump as the needed marks are already set by icedtea ebuild.
-	java-vm_set-pax-markings "${ddest}"
-
-	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
-	if use doc; then
-		dohtml -r ../doc/html/*
-	fi
-
-	if use examples; then
-		cp -pRP share/{demo,sample} "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use nsplugin; then
-		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
-		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
-		docinto icedtea-web
-		dodoc ../doc/icedtea-web/*
-	fi
-
-	# Remove after next bump, handled by icedtea ebuild. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
-		elog "such as Firefox 3.5+ and recent Chromium versions."
-	fi
-}

dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.4.ebuild,v 1.1 2013/01/22 22:17:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild,v 1.1 2013/03/24 13:27:12 caster Exp $
 
 EAPI="4"
 

dev-lang/php/metadata.xml

@@ -19,7 +19,6 @@
 		<flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag>
 		<flag name='pdo'>Enable the bundled PDO extensions</flag>
 		<flag name='phar'>Enables the phar extension to provide phar archive support</flag>
-		<flag name='suhosin'>Add Suhosin support (patch and extension from http://www.suhosin.org/)</flag>
 		<flag restrict="&gt;=dev-lang/php-5.3.6_rc1" name='suhosin'>Add the Suhosin patch  from http://www.suhosin.org/)</flag>
 		<flag name='sqlite2'>Add sqlite2 support. Will be removed</flag>
 		<flag name='xmlreader'>Enable XMLReader support</flag>

dev-lang/php/php-5.3.23-r1.ebuild

@@ -0,0 +1,805 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.23-r1.ebuild,v 1.1 2013/03/23 19:44:45 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/johannes/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="0"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug doc
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite2 sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.0[apache2?,fpm?]
+	>=dev-libs/libpcre-8.12[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite2? ( =dev-db/sqlite-2* )
+	sqlite? ( >=dev-db/sqlite-3.7.7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg media-libs/libpng sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg
+		media-libs/libpng sys-libs/zlib
+	)
+	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xsl? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# They are in PDEPEND because we need PHP installed first!
+PDEPEND="doc? ( app-doc/php-docs )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Apply generic PHP patches
+	EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
+
+	# Patch for pkg-config-0.28 (Bug 455040)
+	epatch "${FILESDIR}"/missing-openssl-include.patch
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+
+	# work around divert() issues with newer autoconf, bug #281697
+	if has_version '>=sys-devel/autoconf-2.64' ; then
+		sed -i -r \
+			-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
+			$(grep -l divert $(find . -name '*.m4') configure.in) || die
+	fi
+	eautoreconf --force -W no-cross
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="--prefix=${PHP_DESTDIR}
+		--mandir=${PHP_DESTDIR}/man
+		--infodir=${PHP_DESTDIR}/info
+		--libdir=${PHP_DESTDIR}/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 )
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl )
+	$(use_with curlwrappers curlwrappers )
+	$(use_enable xml dom )
+	$(use_with enchant enchant /usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext )
+	$(use_with gmp gmp )
+	$(use_enable hash hash )
+	$(use_with mhash mhash )
+	$(use_with iconv iconv )
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos /usr)
+	$(use_enable xml libxml )
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt )
+	$(use_with mssql mssql )
+	$(use_with unicode onig /usr)
+	$(use_with ssl openssl )
+	$(use_with ssl openssl-dir /usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql )
+	$(use_enable posix posix )
+	$(use_with spell pspell )
+	$(use_with recode recode )
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp )
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )"
+	if version_is_at_least 5.3.16-r2; then
+		my_conf+=" $(use_with sqlite2 sqlite /usr) "
+		use sqlite2 && my_conf+=" $(use_enable unicode sqlite-utf8)"
+	else
+		my_conf+=" $(use_with sqlite sqlite /usr) "
+		use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)"
+	fi
+    my_conf+="
+	$(use_with sqlite sqlite3 /usr)
+	$(use_with sybase-ct sybase-ct /usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy )
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc )
+	$(use_with xsl xsl )
+	$(use_enable zip zip )
+	$(use_with zlib zlib )
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb )
+	$(use_with berkdb db4 )
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm )
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm )"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir /usr)
+	$(use_with truetype t1lib /usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir /usr)
+	$(use_with gd png-dir /usr)
+	$(use_with xpm xpm-dir /usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd )"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap )
+		$(use_with ssl imap-ssl )"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase /usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap )
+		$(use_with ldap-sasl ldap-sasl )"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql /usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli /usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC /usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc /usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql /usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite /usr)
+		$(use_with odbc pdo-odbc unixODBC,/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline )
+	$(use_with libedit libedit )"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm )"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
+
+	# Catch CFLAGS problems
+    # Fixes bug #14067.
+    # Changed order to run it in reverse for bug #32022 and #12021.
+    replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				into "${PHP_DESTDIR#${EPREFIX}}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in /etc/make.conf"
+	ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}

dev-lang/php/php-5.3.23.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.23.ebuild,v 1.8 2013/03/23 14:08:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.23.ebuild,v 1.9 2013/03/23 18:30:04 jer Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 
 function php_get_uri ()
 {

dev-lang/php/php-5.4.13-r2.ebuild

@@ -0,0 +1,794 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.13-r2.ebuild,v 1.1 2013/03/23 19:44:45 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug doc
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.0[apache2?,fpm?]
+	>=dev-libs/libpcre-8.12[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg media-libs/libpng sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg
+		media-libs/libpng sys-libs/zlib
+	)
+	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xsl? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# They are in PDEPEND because we need PHP installed first!
+PDEPEND="doc? ( app-doc/php-docs )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Apply generic PHP patches
+	EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv )
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xsl xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+    # Fixes bug #14067.
+    # Changed order to run it in reverse for bug #32022 and #12021.
+    replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				into "${PHP_DESTDIR#${EPREFIX}}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}

dev-lang/php/php-5.4.13.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.13.ebuild,v 1.8 2013/03/23 14:08:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.13.ebuild,v 1.9 2013/03/23 18:30:04 jer Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-lang/php/php-5.5.0_beta1-r2.ebuild

@@ -0,0 +1,795 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_beta1-r2.ebuild,v 1.1 2013/03/23 19:44:45 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="1"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug doc
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.0[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg media-libs/libpng sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg
+		media-libs/libpng sys-libs/zlib
+	)
+	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xsl? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# They are in PDEPEND because we need PHP installed first!
+PDEPEND="doc? ( app-doc/php-docs )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Apply generic PHP patches
+	EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv )
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xsl xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+    # Fixes bug #14067.
+    # Changed order to run it in reverse for bug #32022 and #12021.
+    replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				into "${PHP_DESTDIR#${EPREFIX}}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}

dev-lang/python/python-3.3.0-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v 1.9 2013/03/19 04:46:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v 1.10 2013/03/24 01:41:31 floppym Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -43,7 +43,8 @@ RDEPEND="app-arch/bzip2
 			dev-tcltk/blt
 		)
 		xml? ( >=dev-libs/expat-2.1 )
-	)"
+	)
+	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65

dev-lang/python/python-3.3.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0.ebuild,v 1.6 2013/03/19 04:04:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0.ebuild,v 1.7 2013/03/24 01:41:31 floppym Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -39,7 +39,8 @@ RDEPEND="app-arch/bzip2
 				dev-tcltk/blt
 			)
 			xml? ( >=dev-libs/expat-2.1 )
-		)"
+		)
+		!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
 		virtual/pkgconfig
 		>=sys-devel/autoconf-2.65

dev-lang/ruby-enterprise/Manifest

@@ -1,6 +0,0 @@
-DIST ruby-enterprise-1.8.7-2010.02.tar.gz 7812593 SHA256 5e7268021aa30f9b79f3ed066989cffc8b31b17db9e2aca40c039ff017da4813 SHA512 97fb913e2783eacaf5ae76df229150c5f77d310a06bdd17cdf5e9000db151f73b7194ebea52134e5bd655e52a8c3e6a1ebc0853f36ecae4f12c5c57f23561810 WHIRLPOOL 40961a08ac1eb485df9d325df5cf1373239e3f4be96317981683cc19b1dd66b65c894ce2ef6e6b8602237b0681028834002ee9266ab8e44cd49a12df8673200c
-DIST ruby-enterprise-1.8.7-2011.03.tar.gz 7898840 SHA256 0c0ddbc43b3aef49686db27e761e55a23437f12e1f00b6fe55d94724637bff6b SHA512 31a2e261b4d86b40d759b4786ae0d0261033299b53ce6e06d91170a97e3fc6d3eb56e6ad423b4aee50806753a6f20c44a8e42c25b977389a58d65d1e0ed5f18c WHIRLPOOL 35b603022fc61767dd88a705495f3388b3f0bc4b07a6936a89d7c3b724c3757b86ead40184df22e826f2b5263eb6f3c9781d1c065299eb818d6ea585f289ce01
-DIST ruby-enterprise-1.8.7-2012.02.tar.gz 7918435 SHA256 ecf4a6d4c96b547b3bf4b6be14e082ddaa781e83ad7f69437cd3169fb7576e42 SHA512 f699fbf6eaff71c13f0a19cc14d07baa4dc7a174ea16cb7856d3ca2167b52a92a7e0147e41ab2b4465acbebff9c97d4aa99a889c7e2974e4b1e08a9547b6608e WHIRLPOOL 4e801b2c02ad933988d8722323499cd0548349bd46a168bd0dac0287ea8a0288f9e47d01db109a6a7f78878b33d0be636674bfcd2d42865a2da8cd16b859ecec
-DIST ruby-enterprise-patches-1.8.7.2010.02-r1.tar.bz2 26782 SHA256 d336ebb54d85014ffda4b15733ffdcb5f9faaee5a1633454b880743255c8fd9e SHA512 117bd658ef2791e788b43ca2586a8243085128c9b3ee0ca474b5d24760f890a8a45ca3a0e5e2fb212385f01ba0b8145903ce9f93bf702bd19957b14ff0b26516 WHIRLPOOL f3da3cfac0dcd766726a1089aa137bd9b2e1357465ead08db4abae07fb976e0fe770ea20e64b29bc8cae058e705d8d0a3192e69a46e12a62d468d328204b5dc1
-DIST ruby-enterprise-patches-1.8.7.2011.03.tar.bz2 13040 SHA256 2abceb883ead455e4262bf09dfa6f2a36d5dfa4d37775bac91e222f597c7de22 SHA512 02d2e93712c4f9bb69d9086802373073c61397db6f727d39d30d7201050db8c2f08f30b8097cbf45d0e6d05559648b4fc4482818f6baebf99fe527f5901c6076 WHIRLPOOL 4f5c4ab084ac0e92a9e9fc56a2d46eddde9f8cadf994937682b500a6868e01797b90b4442deefa8454728894488f7250de4307fe345eb67c4ca3db80228149c5
-DIST ruby-enterprise-patches-1.8.7.2012.02.tar.bz2 2013 SHA256 966a53cd7b5449321832166ea2f90bbbacab528f98c07b47fa1cbea2111e9558 SHA512 39202b84bc382f118ea419f1b63ffc76d9bb1c7aec46f45cf31a4935ab016de230d16f01b5f7081764f7aef91a93f790820dc62b8480e12f08fd09f1de654a85 WHIRLPOOL f25e86f40c68ecb647a9ea31eaaa0be327106720e49b8f41a9a482e699a950a1e45c6fdb4dc12d5c20f4b200d37c45c66b14bfbff1ab9a11742bfc14758f61b0

dev-lang/ruby-enterprise/metadata.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>ruby</herd>
-  <use>
-    <flag name='rubytests'>
-      Install ruby tests that can only be run after ruby is installed
-    </flag>
-
-    <flag name='libedit'>
-      Use the <pkg>dev-libs/libedit</pkg> library to provide the
-      readline extension, used for instance by the irb tool. This flag
-      will take precedence over the readline USE flag.
-
-      If neither libedit nor readline USE flags are enabled, the
-      readline extension will not be built (and irb will lose line
-      editing functionality).
-    </flag>
-
-    <flag name='readline'>
-      Use the <pkg>sys-libs/readline</pkg> library to provide the
-      readline extension, used for instance by the irb tool. This flag
-      is meaningful only if the libedit USE flag is disabled.
-
-      If neither libedit nor readline USE flags are enabled, the
-      readline extension will not be built (and irb will lose line
-      editing functionality).
-    </flag>
-
-    <flag name="fastthreading">
-      EXPERIMENTAL Enables fast threading routines. Removes support for callcc.
-    </flag>
-  </use>
-</pkgmetadata>

dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.02-r1.ebuild

@@ -1,202 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.02-r1.ebuild,v 1.4 2010/12/31 15:03:33 graaff Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S="${WORKDIR}/${MY_P}/source"
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX="ee$(delete_version_separator 1 ${SLOT})"
-# 1.8 and 1.9 series disagree on this
-RUBYVERSION=$(get_version_component_range 1-2)
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="Ruby Enterprise Edition is a branch of Ruby including various enhancements"
-HOMEPAGE="http://www.rubyenterpriseedition.com/"
-SRC_URI="mirror://rubyforge/emm-ruby/${MY_P}.tar.gz
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="amd64 x86"
-IUSE="+berkdb debug doc examples fastthreading +gdbm ipv6 rubytests ssl tcmalloc threads tk xemacs ncurses +readline libedit"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( >=dev-libs/openssl-0.9.8m )
-	tk? ( dev-lang/tk[threads=] )
-	ncurses? ( sys-libs/ncurses )
-	libedit? ( dev-libs/libedit )
-	!libedit? ( readline? ( sys-libs/readline ) )
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100402
-	tcmalloc? ( dev-util/google-perftools )"
-DEPEND="${RDEPEND}"
-# TODO rubygems
-PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	if use fastthreading; then
-		einfo
-		elog "NOTE: The fast threading feature in dev-lang/ruby-enterprise is"
-		elog "considered as EXPERIMENTAL. It also disables callcc. Use with care."
-		einfo
-	else
-		einfo "Restoring vanilla threading..."
-		EPATCH_OPTS="${EPATCH_OPTS} -R" \
-			epatch "${WORKDIR}/patches/999-fast-threading-NOAPPLY.diff" \
-			|| die "Reverting the fast-threading patch failed"
-	fi
-
-	if use tcmalloc ; then
-		sed -i 's:^EXTLIBS.*:EXTLIBS = -ltcmalloc_minimal:' Makefile.in
-	fi
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	if use libedit; then
-		einfo "Using libedit to provide readline extension"
-		myconf="${myconf} --enable-libedit --with-readline"
-	elif use readline; then
-		einfo "Using readline to provide readline extension"
-		myconf="${myconf} --with-readline"
-	else
-		myconf="${myconf} --without-readline"
-	fi
-
-	econf \
-		--program-suffix="${MY_SUFFIX}" \
-		--enable-shared \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/rubyee/site_ruby \
-		--with-vendordir=/usr/$(get_libdir)/rubyee/vendor_ruby \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/rubyee/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	ewarn
-	ewarn "Ruby Enterprise Edition is not guaranteed to be binary-compatible to"
-	ewarn "MRI (dev-lang/ruby). Exercise care especially with C extensions!"
-	ewarn "Gentoo does *not* accept any bugs regarding such failures."
-	ewarn
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}

dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2011.03.ebuild

@@ -1,202 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2011.03.ebuild,v 1.1 2011/05/15 17:59:27 graaff Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S="${WORKDIR}/${MY_P}/source"
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX="ee$(delete_version_separator 1 ${SLOT})"
-# 1.8 and 1.9 series disagree on this
-RUBYVERSION=$(get_version_component_range 1-2)
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="Ruby Enterprise Edition is a branch of Ruby including various enhancements"
-HOMEPAGE="http://www.rubyenterpriseedition.com/"
-SRC_URI="http://rubyenterpriseedition.googlecode.com/files/${MY_P}.tar.gz
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+berkdb debug doc examples fastthreading +gdbm ipv6 rubytests ssl tcmalloc threads tk xemacs ncurses +readline libedit"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( >=dev-libs/openssl-0.9.8m )
-	tk? ( dev-lang/tk[threads=] )
-	ncurses? ( sys-libs/ncurses )
-	libedit? ( dev-libs/libedit )
-	!libedit? ( readline? ( sys-libs/readline ) )
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100402
-	tcmalloc? ( dev-util/google-perftools )"
-DEPEND="${RDEPEND}"
-# TODO rubygems
-PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	if use fastthreading; then
-		einfo
-		elog "NOTE: The fast threading feature in dev-lang/ruby-enterprise is"
-		elog "considered as EXPERIMENTAL. It also disables callcc. Use with care."
-		einfo
-	else
-		einfo "Restoring vanilla threading..."
-		EPATCH_OPTS="${EPATCH_OPTS} -R" \
-			epatch "${WORKDIR}/patches/999-fast-threading-NOAPPLY.diff" \
-			|| die "Reverting the fast-threading patch failed"
-	fi
-
-	if use tcmalloc ; then
-		sed -i 's:^EXTLIBS.*:EXTLIBS = -ltcmalloc_minimal:' Makefile.in
-	fi
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	if use libedit; then
-		einfo "Using libedit to provide readline extension"
-		myconf="${myconf} --enable-libedit --with-readline"
-	elif use readline; then
-		einfo "Using readline to provide readline extension"
-		myconf="${myconf} --with-readline"
-	else
-		myconf="${myconf} --without-readline"
-	fi
-
-	econf \
-		--program-suffix="${MY_SUFFIX}" \
-		--enable-shared \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/rubyee/site_ruby \
-		--with-vendordir=/usr/$(get_libdir)/rubyee/vendor_ruby \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/rubyee/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	ewarn
-	ewarn "Ruby Enterprise Edition is not guaranteed to be binary-compatible to"
-	ewarn "MRI (dev-lang/ruby). Exercise care especially with C extensions!"
-	ewarn "Gentoo does *not* accept any bugs regarding such failures."
-	ewarn
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}

dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2012.02.ebuild

@@ -1,190 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2012.02.ebuild,v 1.1 2012/03/03 08:21:53 graaff Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S="${WORKDIR}/${MY_P}/source"
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX="ee$(delete_version_separator 1 ${SLOT})"
-# 1.8 and 1.9 series disagree on this
-RUBYVERSION=$(get_version_component_range 1-2)
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="Ruby Enterprise Edition is a branch of Ruby including various enhancements"
-HOMEPAGE="http://www.rubyenterpriseedition.com/"
-SRC_URI="http://rubyenterpriseedition.googlecode.com/files/${MY_P}.tar.gz
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests ssl tcmalloc threads tk xemacs ncurses +readline libedit"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( >=dev-libs/openssl-0.9.8m )
-	tk? ( dev-lang/tk[threads=] )
-	ncurses? ( sys-libs/ncurses )
-	libedit? ( dev-libs/libedit )
-	!libedit? ( readline? ( sys-libs/readline ) )
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100402
-	tcmalloc? ( dev-util/google-perftools )"
-DEPEND="${RDEPEND}"
-# TODO rubygems
-PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	if use tcmalloc ; then
-		sed -i 's:^EXTLIBS.*:EXTLIBS = -ltcmalloc_minimal:' Makefile.in
-	fi
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	if use libedit; then
-		einfo "Using libedit to provide readline extension"
-		myconf="${myconf} --enable-libedit --with-readline"
-	elif use readline; then
-		einfo "Using readline to provide readline extension"
-		myconf="${myconf} --with-readline"
-	else
-		myconf="${myconf} --without-readline"
-	fi
-
-	econf \
-		--program-suffix="${MY_SUFFIX}" \
-		--enable-shared \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/rubyee/site_ruby \
-		--with-vendordir=/usr/$(get_libdir)/rubyee/vendor_ruby \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/rubyee/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	ewarn
-	ewarn "Ruby Enterprise Edition is not guaranteed to be binary-compatible to"
-	ewarn "MRI (dev-lang/ruby). Exercise care especially with C extensions!"
-	ewarn "Gentoo does *not* accept any bugs regarding such failures."
-	ewarn
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}

dev-libs/gmime/Manifest

@@ -2,3 +2,4 @@ DIST gmime-2.4.32.tar.xz 685512 SHA256 a0e8f3a1949e7281e92edc5dd6309a7ca34b6838c
 DIST gmime-2.4.33.tar.xz 692336 SHA256 27dfa99967c19d2e8707b2670bd084dd514167925cca92cbd474298fc515d391 SHA512 15efb527ea6162b63a4773b0f4b30f0e34cb96e46fd85c5489a9fb4b262b837c8a563eeaf737f82dc805ecce379e5247c32c84f6d8127aea3cb9fdf3c0bcc973 WHIRLPOOL abb9c7e66222fb290b339ce0a5172fbe2780ac6101b1838d5f15ac0b85b55c6c1a4c8d7ead7d55d8b71a5284af93ec4d182ba34ac3168ef9ccf2bfe174ce2282
 DIST gmime-2.6.10.tar.xz 721824 SHA256 a0e1132613339d6ba06df483a1f8d8bda6feb4f58f8b102daab2f1390fd6a3b7 SHA512 6dcd6dbef52ce633d1033df4420a78facf06bf586f0cc8349f4720f3c723f9d7d74ed20832fb7baafbd90f8bd520ce5bb1dfa675cb5a0f2e34bdf83751805882 WHIRLPOOL 2d0432559748553507634e0379dba39cd55abb0783fc0bae0972b25709d4c62f4394dc255195522647343777f01d6df424618480bb5592cfd8404ddd15d3531b
 DIST gmime-2.6.13.tar.xz 731888 SHA256 42a47a7f9508db3e1cfbb374a23260e75d7fc7696f488a26aa59f5e2d8dac154 SHA512 2e7c632e1e2a5b8df7f6f381512a05b89f57b5a981adbfbdce8a7e7e0370d02f438efec5ad80dbbc23438c15c14b83a55d589a41b988fc1893934172a60fc0de WHIRLPOOL e899c96e728814851f55522a2a38c51882fe1cf2cdec5e4971830f26c0ff74675118ff16c653ded47abfe3e089dd24cf2020d59ffd08582057bd5e86b3c684e9
+DIST gmime-2.6.15.tar.xz 731880 SHA256 b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a SHA512 536ddc4e7e65335be05262626bfe15c70b53f9bd4771dce9f9ddad86ca7ef4af3a320e31f964dc33232ebd44b4a971350eaf5abfd8e345055092af0f83972f3d WHIRLPOOL bb88a41b1ea4eb7ac0c9fd2d7ba9195ab01127a42081876fc20ba33beb7dcab72fe6008fbb5016bf6fc731ffe9da94cc20586e7c9ed344330167a4649c76496e

dev-libs/gmime/gmime-2.6.15.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.15.ebuild,v 1.1 2013/03/24 13:41:39 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils mono
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/stable/"
+
+SLOT="2.6"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc mono static-libs"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	sys-libs/zlib
+	>=app-crypt/gpgme-1.1.6
+	mono? (
+		dev-lang/mono
+		>=dev-dotnet/glib-sharp-2.4.0:2 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	mono? ( dev-dotnet/gtk-sharp-gapi:2 )
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-cryptography \
+		--disable-strict-parser \
+		$(use_enable mono) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	MONO_PATH="${S}" gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \
+		gnome2_src_install
+
+	if use doc ; then
+		docinto tutorial
+		dodoc docs/tutorial/html/*
+	fi
+}

dev-ml/herelib/Manifest

@@ -1 +1,2 @@
 DIST herelib-109.11.00.tar.gz 45504 SHA256 ae94650fb7d806887c01b01a558f5687ee833f79418228147207f57a405495c4 SHA512 a8fdcda48ba722e1934c1637625039a3045e78f16d2485f0ee3d166580398339c9b36fef76b780f5c0c1188d2a04a19f1fe397470c69c964516eaa949cb190d1 WHIRLPOOL 0f1b027df3abb3c8b573a370cdba4170af1e5d6e69ef513d89d4c066b60f98792c21828818d5d2815a1178bffcb78973c0a71a5f3d0b4b5a387ad6494068e04a
+DIST herelib-109.14.00.tar.gz 44565 SHA256 e8c2f6e9dec5e5549542f50d1ae0f05b03e6171480b319a33a80f9913ca76dc7 SHA512 9117281eb253e86bbc201f986bbb0e16bbb2600e69de75b2c4e2c038bcd027f42b094fc49d7c579db73ffad8476c55bac61c004ea5eb8a640e3b138c4e94e0c0 WHIRLPOOL 014a4f227783c6da855753a38699a90b6d45dff48f1b1a76621c26a514746b8ec823e1d83b52f6b3572c64335d11a3435a653c83646eecb4a784d640e874afb5

dev-ml/herelib/herelib-109.14.00.ebuild

@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/herelib/herelib-109.14.00.ebuild,v 1.1 2013/03/24 15:15:20 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Syntax extension for inserting the current location"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.00.0:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"

dev-ml/pa_ounit/Manifest

@@ -1,2 +1,3 @@
 DIST pa_ounit-109.08.00.tar.gz 50048 SHA256 ee65a9f8727bfb4bdd0990b6654cf7d876821652c1bb500639380dda20186e3a SHA512 a9adbd8a26ae7519ae2e76605cc2015e00a4c9747a2a1f07f2eb7ef6c17323860e895e3d2b94adb80d89c85836f6f500e14fab97198e3cb6ee6d2248f8ecacd9 WHIRLPOOL dbe9e82eb581950ec548ee1930597b14c0f94f6f5ddf80ee9d8a37f77d5b946e8909a9d85a83dd4ba6b4a87f170a54a97ab775df2d012ec8823f5233cc42ec10
 DIST pa_ounit-109.11.00.tar.gz 50871 SHA256 8e2b4bfac6e779c56feffcddbdfafd4c66a3f1e604cea48317190b6384e68a73 SHA512 c1640bc0434afb4070ec4ae077d78f2c448850d9dc0c2b570a704d40cc4e70f6f607fda6a4a84c1e1b5fac2dce46738c16cbfb757ef9f416d06f25c295d202c6 WHIRLPOOL 44a0dc8eb17611658d2c5b22d88205b31a489a33f2d52ed14a29bb0f4352dc82e56c3049b1cae5a2a7fe90dc4006e5838146a2127440b51e8f3983271b29ffa1
+DIST pa_ounit-109.14.00.tar.gz 49949 SHA256 eac0e200ae2c474eb6bdc6f81fdbe4a41fe423744f5f78ead12d09898423ab8c SHA512 cf604875be4e6b36519cd27a0e9dd09184368f1472fec7ff3de8450a5d36809f78eb744ca1f94ea40f89e53048154317253f1fb1a50221f5bfa1446580b39b30 WHIRLPOOL c5818067948a29e9a3e8ac6e0d86463b4cf32eebc5ea304459c9684c1479a5dfbe1938068bf1ed7cc2fbe24bd1f6ea8d236f620798b15d3b4b594081792181a8

dev-ml/pa_ounit/pa_ounit-109.14.00.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pa_ounit/pa_ounit-109.14.00.ebuild,v 1.1 2013/03/24 13:39:01 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Syntax extension that helps writing in-line test in ocaml"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/ounit-1.1.1:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "readme.md" )

dev-ml/sexplib/Manifest

@@ -1,2 +1,3 @@
 DIST sexplib-109.08.00.tar.gz 115993 SHA256 92990b60509c6542c939f0ae5a257944a81907d4c2af4c4059afaab0b3200e1c SHA512 1d2b439366ced936fc040a971e6bdad9395b0cd66d3d9a62eef38ae59768bcf6ead82022fc9ac5b786c501208c48d5ef275a376c6308a9fb56d6c04d3ac3b830 WHIRLPOOL 84a052ca8d8cdc68da7ab2dcc32d74395d7903e0fab4345019db20d477271391734cd84e4fae1a41464a093a6a6dc5c1bc2a9d0c0ba330370e7a337db85582df
 DIST sexplib-109.11.00.tar.gz 115937 SHA256 0311f443effe6a543ffa6a8a16d5c7971e238fca59bb9176b9868d440e30c033 SHA512 3d89f070a4f72eda628171b6eb20de7101f2f48d28aba0cbf3f224d2775298b0c5c3f3436b950d9d77bf0836ca3ac73dae647ffe0af6f68cc213b828e05e0972 WHIRLPOOL dcbdbe41aefd3716af9d1dbc44520a1abad15e246f077ac4afc4fc49e365c88350264dbf834b0da0e15c1921b3c5568cfd351e61894060b8131a926ccce71f5c
+DIST sexplib-109.14.00.tar.gz 115086 SHA256 e78513ef71264fe853dafa9ac46804b95e9ee4da51b33fee87c04583ccf9d92b SHA512 2d09c77148edf7bd7c7873261a020fe486cd9277f1bf083fe15d60c232adaae514a5ba63c1a918e614d3b5bc57daf871808e0ca8ced4ff06855522c96359ce11 WHIRLPOOL e7fe4211ad518e8d2dd13a92f3794746f693d1dbbf2ede4dad84e64ad0a16cb55f7f7ca64cb523ab2c4c5ed8fa0c34646691cdb8766f435240f4c8ca728c69aa

dev-ml/sexplib/sexplib-109.14.00.ebuild

@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/sexplib/sexplib-109.14.00.ebuild,v 1.1 2013/03/24 15:01:57 aballier Exp $
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-ml/type-conv-${PV}:="
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" "CHANGES.txt" )

dev-ml/typehashlib/Manifest

@@ -1 +1,2 @@
 DIST typehashlib-109.11.00.tar.gz 52543 SHA256 5e33d6151319d14adf7bcf4254a6d1eea1a2f7d9fd57a60cdd9d6a6c0e9bd35e SHA512 97201f62a8027d9ec814e1ff8f728bff0037db7fb8187aeb12fb0663a092a32c73e844444b9074eb0ef18919209b6d91a20ed5f52221ea98536e6479fd29068c WHIRLPOOL 2d6c240edd40bdd8b0d24b49df43670f48f1a72e1fa963ddc206d397b7735fdf0503cc747352795ffe8baee88a7c3a88061f3d876b542ff2d20b00399ca05be0
+DIST typehashlib-109.14.00.tar.gz 51602 SHA256 2b8d4b4a5bb40271cef6e265ba21fb8b29b808797811bb8ac61660217cf876ed SHA512 1881fd969db6af2f6aba16bd0abc8cf45aaa1ab1975e7db45480eb86943a2d6929a211e41ad940d786b1dc11d499fdd8071da0e4ab6966d79863c09412dfd316 WHIRLPOOL 78acbbac5ac849f266ae8f1fd961b42ca67a523a15357e418ae175f4edc4604a183933500b368d85963dabf7feb8697bf2541b041e5d5815401e60d931346b4e

dev-ml/typehashlib/typehashlib-109.14.00.ebuild

@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/typehashlib/typehashlib-109.14.00.ebuild,v 1.1 2013/03/24 14:19:04 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Syntax extension for deriving 'typehash' functions automatically"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.00.0:=
+	>=dev-ml/type-conv-${PV}:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"

dev-ml/variantslib/Manifest

@@ -1,2 +1,3 @@
 DIST variantslib-109.08.00.tar.gz 58477 SHA256 456e5a74b560f096e5171422c9dada45700693ab4656ece86ee2a0997cca9791 SHA512 73eac3542ebc17f4773a483fb2363f273cde310445da5adaa85a5c723e97c145b1cb1d85d57ff2c07d0de1372e12874441fe0acfde7566a49009786c283f3210 WHIRLPOOL 4ba0225fd74b3f889c1fc5dfb741b4e168ecebfc18f87c3bbaf431575e8a96bcad0320482332189b1b86795d3ae48b2bc6bf2f84f57bc262faf82a08630b1d17
 DIST variantslib-109.11.00.tar.gz 58118 SHA256 67fe9f07558b304c3b54188ab100b7854bd6e252e6bdf4547b034047bab0ddd2 SHA512 a4ceca89d296cf001e5ac6a1cea4433205f3f57123f6842e2a371fe94bfbbab65ddf0baea3fa8d074974823e28f13c1b4eb019c2b11361a61dde272000c74132 WHIRLPOOL 2e001b11bcd0b8817bdaf0621bcd8e55af0519f63a76d3a3c7078370a75a963028bedc89adec860f5846d62d043c42642fe90594afd329bcb13876ae2be2bd2a
+DIST variantslib-109.14.00.tar.gz 57163 SHA256 f3392d1249abfd33b3c6a6a33f1592fa3ffa6e56a8adcd8326ea330016a0defb SHA512 0b8ba6fd2b80148dd6ae002699dc43efbb35059f75f335b6c2189fc423dd19b2d317dd6dd6796c3ea73a3ca1d29b96a55cf8172f0fb45045eb0e8882d9715785 WHIRLPOOL 4cdc57735ced018092880c645e83ba0d7ad92fab63a1c57661164ffa8454b73dcf8f1d10f6e25fce5d9f03e1c444f50aad80a28cbbfbba4c6fd8b944117992f0

dev-ml/variantslib/variantslib-109.14.00.ebuild

@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/variantslib/variantslib-109.14.00.ebuild,v 1.1 2013/03/24 13:57:53 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="OCaml variants as first class values"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-${PV}:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" )

dev-perl/Exporter-Lite/Exporter-Lite-0.20.0.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Exporter-Lite/Exporter-Lite-0.20.0.ebuild,v 1.3 2012/12/05 11:27:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Exporter-Lite/Exporter-Lite-0.20.0.ebuild,v 1.4 2013/03/24 10:39:24 grobian Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Lightweight exporting of variables"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86 ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86 ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"

dev-perl/Sys-CPU/Sys-CPU-0.540.0.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sys-CPU/Sys-CPU-0.540.0.ebuild,v 1.1 2012/11/13 19:30:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sys-CPU/Sys-CPU-0.540.0.ebuild,v 1.2 2013/03/24 10:40:22 grobian Exp $
 
 EAPI=4
 
@@ -11,5 +11,5 @@ inherit perl-module
 DESCRIPTION="Access CPU info. number, etc on Win and UNIX"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 IUSE=""

dev-perl/Unix-Getrusage/Manifest

@@ -0,0 +1 @@
+DIST Unix-Getrusage-0.03.tar.gz 32243 SHA256 76cde1cee2453260b85abbddc27cdc9875f01d2457e176e03dcabf05fb444d12 SHA512 6d2c15e56c4153e8f6e27f23590a09000ebfabe820af6ebc52ddc4cfcf79bad3c607c62841fa68cf370773844d5a0d54e948f6545b7e5127da87ecb14dda7395 WHIRLPOOL e4e09e503f6e9978b0455d29d888349d9d8d00f323299e9896835fede76a361f3525e7b94d27ab8c1fabd6ff90bb06057540dcf2d50f0ce7050e9f14ed3d1587

dev-perl/Unix-Getrusage/Unix-Getrusage-0.030.0.ebuild

@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unix-Getrusage/Unix-Getrusage-0.030.0.ebuild,v 1.1 2013/03/24 16:16:08 pinkbyte Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=TAFFY
+MODULE_VERSION=0.03
+
+inherit perl-module
+
+DESCRIPTION="Perl interface to the Unix getrusage system call"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SRC_TEST="do parallel"

dev-perl/Unix-Getrusage/metadata.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>zlog.gentoo@gmail.com</email>
+		<name>Mikle Kolyada</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Unix-Getrusage</remote-id>
+		<remote-id type="cpan-module">Unix::Getrusage</remote-id>
+	</upstream>
+</pkgmetadata>

dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild

@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild,v 1.1 2013/03/24 11:14:42 mschiff Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 python-r1
+
+MY_PN="python-coverage-test-runner"
+DESCRIPTION="fail Python program unit tests unless they test everything"
+HOMEPAGE="http://liw.fi/coverage-test-runner/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/coverage"
+RDEPEND="${DEPEND}"

dev-python/bitstring/bitstring-3.1.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.1.ebuild,v 1.1 2013/03/23 11:51:54 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.1.ebuild,v 1.2 2013/03/24 02:24:48 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2} )
@@ -14,8 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="app-arch/unzip"
 
 python_test() {
 	pushd test > /dev/null

dev-python/cliapp/Manifest

@@ -1,3 +1,4 @@
 DIST python-cliapp_1.20120630.orig.tar.gz 42749 SHA256 6beeb1fb3077561540094584ce36055266ac67b80f158b9b82fe4075096f4716 SHA512 ccd44906d2e897c91f4aee631da94f324c6f0b2b10216315a2d4c1e99f6cbcd8794e4de66a259e7f97261fbe62faa157e150a8c17b255124f631c3e7b05f4c75 WHIRLPOOL 08020ea7384f53f709b20228d4663ab5c5395173c5dc357dec1863ddc38d5060599e003f651494edc0187acd1b23d4e892ff878412505b4d84e670ae8645003a
 DIST python-cliapp_1.20120929.orig.tar.gz 43832 SHA256 30d5077e53b3e45f892b1c49feaaf4f47e4664400ed71435e77a82a2b823a0f8 SHA512 72e674d52c8f6c46e949a7060a7eacb908a1e838e3e4ddf55c4cf9bcf063c09cf9354be9bdbd76efc7e1497eb4c8e62ec75fedf6eb12b8ffbf607b321a26b477 WHIRLPOOL 7db348419e3d4de0991170ce0a458b51c2d21bdc2c2e9911455605acdfc53afc180c9094971cbcbf5c53072563c3cc4579be151d6b68669263b48435869bfc29
 DIST python-cliapp_1.20121216.orig.tar.gz 44799 SHA256 455bc7a87e8de4894e84a4bdfc0dcd48ca715497e173e671410ff1211561fbaf SHA512 eda266ecebc13b87cfedd2b8b4271594f99c4316d009f26010c65bec0c5c53352b26e788677df6d16a340b0822561be31803b25cfa6589bcc525d8a9fe190791 WHIRLPOOL 1a64b76d94a8a1168fa1d4c892abffe3aca21e266deeab596d4febb536d84f0e132f2524789d408c919a2324f326fba8e339a2005fafd36fc8d6e09fcdcc7498
+DIST python-cliapp_1.20130313.orig.tar.gz 49892 SHA256 151f5bd53937fb58a6d90a93aca4a7163b3775c7ff616f76d60f19838c1a6166 SHA512 61c8ecbd5b3fe64711f84450570e7546ad76d819f62ccc7b0ef68b05e23cab3a18dea525ebee201272b3029cfcfd15ed67ff6df4cbf5f1a55f26bd7520de67e8 WHIRLPOOL caedf474d676f2e3d39061712e6ad58da8cadbce0be046494572bab17450be9a1e9a334f815c34527d84bd7b387a07c55e8241631c54527b1f6d17c9bfd875f6

dev-python/cliapp/cliapp-1.20130313.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/cliapp-1.20130313.ebuild,v 1.2 2013/03/24 12:24:13 mschiff Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Framework for Unix-like command line programs"
+HOMEPAGE="http://liw.fi/cliapp/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="${PYTHON_DEPS}
+	test? ( dev-python/CoverageTestRunner )"
+
+src_test() {
+	addwrite /proc/self/comm
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	emake check
+}

dev-python/django/django-1.5.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.0.ebuild,v 1.1 2013/03/16 18:11:39 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.ebuild,v 1.1 2013/03/24 02:05:20 floppym Exp $
 
 EAPI=5
 # py3.2 support almost ready to add
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='sqlite?'
 
 inherit bash-completion-r1 distutils-r1 versionator webapp
 
-MY_P="Django-${PV/.0/}"
+MY_P="Django-${PV}"
 
 DESCRIPTION="High-level Python web framework"
 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"

dev-python/graph-tool/Manifest

@@ -1,2 +1,3 @@
 DIST graph-tool-2.2.21.tar.bz2 29557399 SHA256 0b5bb9c4c980f385a88c07c5d0254b780340244f723a065eb04347584ca86696 SHA512 3664a0b3428918a6caced12e95005cb647ee96d1cf0aa6e64ed6d7a5c41f8dba5f019adbf28d521015b8099f55a7f16fcc4b981250f4931b33eac6208e2a373f WHIRLPOOL d70824f999e61b44c44c94c9b5a74233acbaaa857715ef9e8b7406661be7ca8d895ea3a55bf22c819aa046af8718ade84f6603597a4453e49217b57a75842b6c
 DIST graph-tool-2.2.22.tar.bz2 29564502 SHA256 c889466c82e972688bb2b477a9ab2af9900b8c80451630a275ed0eca34180715 SHA512 2d8326f9acf1fcc4b3c5d6d6dd8ef7a8f880458e57767b8b75b4930d28ab84a264b16fa8b26ffae0e143055e302ebfb6f6ad3f3fef850ac7c5ba9ea14ba09d20 WHIRLPOOL b15aaf7e18766fea9f03ee892c1dd28eb1697e037e8feb600ba9b16cf4714ab9b4f67515402f766f803aef17346a41e4678d9bcc7e08dc69dac5f742d8b02455
+DIST graph-tool-2.2.23.tar.bz2 29575286 SHA256 228c9b19f0e7aef512fdb6638cf1366014ad5a69d860f5ab26a278a4fb5094b2 SHA512 851642e9042fd32f830653f56a9f6ef7bb5fc38dcbe72e57554dc17c99f56bd98ef3bf77cc0865248c442b8f3a18c965d43f771921bcd40f75b2dad3bbd08608 WHIRLPOOL cab4b96e66683db8443be552b64d2ccaec667a2888765f03502e9e628f3b07caf6acb7283f5c6549ec720c09f1233d659f3258d50716c679cf8cfdc109d37451

dev-python/graph-tool/graph-tool-2.2.23.ebuild

@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.23.ebuild,v 1.1 2013/03/23 17:51:29 radhermit Exp $
+
+EAPI=5
+# python3 dropped until scipy reinstates support
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs eutils toolchain-funcs python-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.skewed.de/graph-tool"
+	inherit git-2
+else
+	SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="http://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+
+CDEPEND=">=dev-libs/boost-1.46.0[python]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-mathematics/cgal
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	media-gfx/graphviz[python]"
+DEPEND="${CDEPEND}
+	dev-cpp/sparsehash
+	virtual/pkgconfig"
+
+# most machines don't have enough ram for parallel builds
+MAKEOPTS="${MAKEOPTS} -j1"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	>py-compile
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir \
+		econf \
+			--disable-static \
+			--disable-optimization \
+			$(use_enable openmp) \
+			$(use_enable cairo)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+
+	# remove unwanted extra docs
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null
+	"$@"
+	popd > /dev/null
+}

dev-python/larch/Manifest

@@ -1,2 +1,3 @@
 DIST python-larch_1.20121006.orig.tar.gz 88188 SHA256 b4482981010e9c22ee3fce6fdc664b8fc0a1a3a18ed30b40f247f3b44437ccfa SHA512 f82c94f32cdfb434513a2ea11e55c88c6ef4dc6147efc2bc02c62ca2e75da0be8ca35d30c962a0861b0902dcd624daf42432ada4f59d098078a1768284e20dbf WHIRLPOOL b02681e3349e73441f6aeb235b1e30d1427bf8ed94165113ab57dde55ef87a943149c24074f55814c77b0901e5af25a913091fdfaf12ad16ad3f29dc095abbcb
 DIST python-larch_1.20121216.orig.tar.gz 87572 SHA256 43c7c57c6b9564d72e6c7b2b46f8cba54da832c1d5756ba284e14e8e748e9070 SHA512 8676bf38c6ed5af11e3ad4bcfa313eb53ac9b1a298fafea7086251a0da299e44f831de7d13a19ea3fb2e161c09af642b8bb6c3de5daa331a28b13242e6e4815c WHIRLPOOL abe8dbb73b19bd93e9fcfb7a2db4a4d6505bf5710ff18047baa29f0ade1e343e31ff896d60d5d67423fd0e3ff7d61ff89eaa14395d9ac63e10f2205f74ba27fd
+DIST python-larch_1.20130316.orig.tar.gz 88040 SHA256 45081f933201512e536ff631ae280b1c17b9342f4789de366da7fd2681af7bd6 SHA512 f3a962750bc1fb55af775967fd5ae5894b864de4febb749a803dbc8530a3fb053f537039f249b256e9c9eef39b780db081d3a53b5ad93669a0002274ec0cf943 WHIRLPOOL 7df88954696195e91548c9ca29f3a3ff0c6f6e2dd716eb1e29f8d56beb63fa8c9975941b316e2eeb8ae296da955877c00bfdde727dd806e89c4eabd631eb529b

dev-python/larch/larch-1.20130316.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/larch/larch-1.20130316.ebuild,v 1.1 2013/03/24 12:18:50 mschiff Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Copy-on-write B-tree data structure"
+HOMEPAGE="http://liw.fi/larch/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+#RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/CoverageTestRunner dev-util/cmdtest )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/cliapp
+	dev-python/tracing
+	dev-python/ttystatus"
+
+src_test() {
+	addwrite /proc/self/comm
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	emake check
+}

dev-python/psycopg/psycopg-2.4.6-r2.ebuild

@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.6-r2.ebuild,v 1.1 2013/03/24 02:17:55 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-base-8.1"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	[[ ${EPYTHON} != python3* ]] && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.4.2-setup.py.patch"
+		"${FILESDIR}/${PN}-2.0.9-round-solaris.patch"
+	)
+
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+#	if use mxdatetime; then
+#		sed -i 's/\(use_pydatetime=\)1/\10/' setup.cfg || die
+#	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc -j1 html text
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc doc/{HACKING,SUCCESS}
+
+	if use doc; then
+		dodoc doc/psycopg2.txt
+		dohtml -r doc/html/.
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/.
+	fi
+}

dev-python/py/py-1.4.12-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.12-r1.ebuild,v 1.4 2013/01/02 04:30:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.12-r1.ebuild,v 1.7 2013/03/24 12:36:26 maekke Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="app-arch/unzip

dev-python/py/py-1.4.13.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.13.ebuild,v 1.1 2013/03/11 06:49:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.13.ebuild,v 1.2 2013/03/24 02:07:33 floppym Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
-DEPEND="app-arch/unzip
+DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( >=dev-python/pytest-2[${PYTHON_USEDEP}] )"
 RDEPEND=""

dev-python/pycairo/pycairo-1.10.0-r4.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.5 2013/03/06 12:54:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.8 2013/03/24 13:04:32 maekke Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} python3_{1,2,3} )
@@ -19,7 +19,7 @@ SRC_URI="http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.t
 # || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
 LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples +svg test xcb"
 
 # Note: xpyb is used as the C header, not Python modules

dev-python/pyinotify/files/pyinotify-0.9.4-workaround-sandbox-bug.patch

@@ -1,34 +0,0 @@
-diff --git a/setup.py b/setup.py
-index c318749..f0a1884 100755
---- a/setup.py
-+++ b/setup.py
-@@ -61,14 +61,25 @@ else:
- 
- def should_compile_ext_mod():
-     try:
--        import ctypes
--        import ctypes.util
--    except:
-+        if sys.hexversion >= 0x03030000:
-+            from unittest.mock import patch
-+            with patch('subprocess.Popen'):
-+                import ctypes
-+                import ctypes.util
-+        else:
-+            import ctypes
-+            import ctypes.util
-+
-+    except OSError:
-         return True
- 
-     libc_name = None
-     try:
--        libc_name = ctypes.util.find_library('c')
-+        if sys.hexversion >= 0x03030000:
-+            with patch('subprocess.Popen'):
-+                libc_name = ctypes.util.find_library('c')
-+        else:
-+            libc_name = ctypes.util.find_library('c')
-     except:
-         pass  # Will attemp to load it with None anyway.
- 

dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild,v 1.3 2013/01/22 19:48:35 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild,v 1.4 2013/03/24 01:44:40 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
@@ -19,11 +19,6 @@ IUSE="examples"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
-python_prepare() {
-	local pythonver=${EPYTHON#python}
-	[[ ${pythonver//./} -ge 33 ]] && epatch "${FILESDIR}"/${P}-workaround-sandbox-bug.patch
-}
-
 python_install_all() {
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples

dev-python/pysqlite/pysqlite-2.6.3-r1.ebuild

@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.6.3-r1.ebuild,v 1.2 2013/01/14 21:11:20 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="DB-API 2.0 interface for SQLite 3.x"
-HOMEPAGE="http://code.google.com/p/pysqlite/ http://pypi.python.org/pypi/pysqlite"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="pysqlite"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="examples"
-
-DEPEND=">=dev-db/sqlite-3.3.8:3[extensions]"
-RDEPEND=${DEPEND}
-
-python_prepare_all() {
-	# Enable support for loadable sqlite extensions.
-	sed -e "/define=SQLITE_OMIT_LOAD_EXTENSION/d" -i setup.cfg || die
-
-	# Fix encoding.
-	sed -e "/coding:/s:ISO-8859-1:utf-8:" \
-		-i lib/{__init__.py,dbapi2.py} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_test() {
-	local script='
-import sys, pysqlite2.test, unittest
-r = unittest.TextTestRunner().run(pysqlite2.test.suite())
-sys.exit(0 if r.wasSuccessful() else 1)'
-
-	cd "${TMPDIR}" || die
-	"${PYTHON}" -c "${script}" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}usr/pysqlite2-doc"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r doc/includes/sqlite3/. || die
-	fi
-}

dev-python/pysqlite/pysqlite-2.6.3.ebuild

@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.6.3.ebuild,v 1.8 2012/02/24 01:09:05 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="DB-API 2.0 interface for SQLite 3.x"
-HOMEPAGE="http://code.google.com/p/pysqlite/ http://pypi.python.org/pypi/pysqlite"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="pysqlite"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="examples"
-
-DEPEND=">=dev-db/sqlite-3.3.8:3[extensions]"
-RDEPEND=${DEPEND}
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-PYTHON_MODNAME="pysqlite2"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Enable support for loadable sqlite extensions.
-	sed -e "/define=SQLITE_OMIT_LOAD_EXTENSION/d" -i setup.cfg || die "sed setup.cfg failed"
-
-	# Fix encoding.
-	sed -e "s/\(coding: \)ISO-8859-1/\1utf-8/" -i lib/{__init__.py,dbapi2.py} || die "sed lib/{__init__.py,dbapi2.py} failed"
-
-	# Workaround to make tests work without installing them.
-	sed -e "s/pysqlite2.test/test/" -i lib/test/__init__.py || die "sed lib/test/__init__.py failed"
-}
-
-src_test() {
-	cd lib
-
-	testing() {
-		PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" -c "from test import test; import sys; sys.exit(test())"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	rm -rf "${ED}usr/pysqlite2-doc"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/includes/sqlite3/* || die "Installation of examples failed"
-	fi
-
-	delete_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/pysqlite2/test"
-	}
-	python_execute_function -q delete_tests
-}

dev-python/pytest/pytest-2.3.4.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.4.ebuild,v 1.4 2013/02/26 06:33:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.4.ebuild,v 1.7 2013/03/24 12:35:12 maekke Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version

dev-python/python-mpd/Manifest

@@ -1,5 +1,3 @@
-DIST python-mpd-0.3.0.tar.bz2 18333 SHA256 8f235b3d6ac7bf1c8922ed5ad7b39ce5f1002911cfad10cfff2f39e527dece1d SHA512 d1ee57659ce6d41954beadc10b26de8b3f5e2f8395c4b5ada7c00cbfef20f693de51e41fc3931118cc63eb15195d1701c74e36eabf9f71c3505f97f66587e27a WHIRLPOOL cb1916fb3c19de020b6d351ed3ac8d4e0c485ee4eac3f4b0362065e6ca83249a7150d52be971b1ad239aeffbcd30020f88db754b18c5689194eecba299cd425a
-DIST python-mpd-0.4.2.tar.gz 24859 SHA256 92bdf74965efbff7cd8bfef0a5b68fbf79957952eaf2ae676e79b2c6226e1c04 SHA512 407b7c6db8f122efce32b7289002ee84313898b4b1bd101bd89cc1fd18b59822d0870747814d6ac01ac8380d7b835521cf8cb9c4365e61926de1d952eccf7d34 WHIRLPOOL 0c3e90fcd4b81ed0ee4b49f5a524a79a01b70e635e587e0ffb3fbe0828f4f884b5553d50f52f3313471d83d8c3aaea8eb271629a5d693b846f7f0953cde3b09c
 DIST python-mpd-0.4.3.tar.gz 25080 SHA256 85d92369b45ea407fa6129b793d5a77f989d85369503380eca7e380d9a33c37b SHA512 f66ab330a574d6a2f2e5d2f3891a4c2b39196bd107cb84a4d2870d0a452bd59ce3b18dde8c8e205d07d0a96d31a34b4dc1bf90d5c28f807b180e193e13e0f945 WHIRLPOOL 4c0cee171da6c6ebf421d7b8f705e745f4f3d458774a567cd6576d12b3071b6571a8f40cf6788d708e1b54f9a369c943a269fa219bba5b9e1c6f808b03a09724
 DIST python-mpd-0.4.6.tar.gz 27340 SHA256 4e0f18a467ebbb2b08e07579c4744f0a7640d15107eb9813fcea2bf12cdadbf0 SHA512 33adb7b68753e64f3c284885ce374f84e7f54677f695730203932ed1c6142187c272d461b72cea364038372575b2f09fa41fb8bcbfe1e08d012b6b655abd73ee WHIRLPOOL 3d94c1280d3031a8c8705288a9d48b4dcea7d7a1c8a2b4a86e5620742652c89d1fe32b57139a3332fec87460c0b39cd11d27a09ef1afcf5703376eba7d5ceec9
-DIST python-mpd-0.5.0.tar.gz 29006 SHA256 80176cf3883255df5192d3ea274ce1fec98b70a70b94a660226fcfe6ac213b6a SHA512 77f011d7cb84463cc4ff2f613b43b5966612e7448f7fe00abd0c481eb2c97c9bd05a578e297773e46d9c1e3e114529ff8f8091c025fe18b9c327171f9c801be5 WHIRLPOOL 8cf2481429648ee5f1c9d0d40a62e213ebb22d02af92d32c3e0456c3b15f40522503e75fb96de06fb2f73bdce36e395616885fd4c4e83cf5b9681a42e255eef4
+DIST python-mpd-0.5.1.tar.gz 29573 SHA256 6e7bb1c265c8b0be0b8cc366d1e68fdc5328546b25ffc5be0e8b085eb75f7ddb SHA512 ea94b35fa6240bb978bb0bc954e72e76c40c69e78c87262400a78f0ee464d6938c19ae255c79fb2ad445fc832ad9a3b38ab29688546a11f93a8f8bab1285bcca WHIRLPOOL 840684e9a0f733986e730dc9b6ef128e9cd0bcfc4472f80c75a3ccf11083b2c01510dc3abeef5322f834e125b0f1ff4abc8aee9c74abe5d208137a35e5a6bf5d

dev-python/python-mpd/python-mpd-0.3.0.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.3.0.ebuild,v 1.8 2012/02/10 03:48:25 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="http://jatreuman.indefero.net/p/python-mpd/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-PYTHON_MODNAME="mpd.py"
-DOCS="CHANGES.txt README.txt doc/commands.txt"

dev-python/python-mpd/python-mpd-0.4.2.ebuild

@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.4.2.ebuild,v 1.1 2012/07/12 14:51:27 angelos Exp $
-
-EAPI=4
-PYTHON_COMPAT="python2_6 python2_7 python3_1 python3_2"
-
-inherit python-distutils-ng vcs-snapshot
-
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="https://github.com/Mic92/python-mpd2"
-SRC_URI="https://github.com/Mic92/${PN}2/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-DOCS="CHANGES.txt README.md doc/commands.txt"