Sync with portage [Tue Jun 11 10:35:51 MSK 2013].

app-admin/logrotate/logrotate-3.8.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/app-admin/logrotate/logrotate-3.8.4.ebuild,v 1.1 2013/05/10 19:45:40 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.4.ebuild,v 1.2 2013/06/10 20:32:29 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="acl selinux"
 
 RDEPEND="

app-admin/lsyncd/Manifest

@@ -1,3 +1,4 @@
 DIST lsyncd-2.0.5.tar.gz 135038 SHA256 3d76f26623a97de700764090abcc0d1e7ded50f386402567222dfd01a612121e SHA512 df3bde08ff98ce3de3d1350ade56f1abbe786ced30eb94fd6cc7745c036bc99af8b01ee3bc0c8cd7225251f10e7ae2a7480832a07a6439fde1f9ca95fb57ec1a WHIRLPOOL 60e5907dd4dae04417c51e0e3c9bf00b021c1c26a2a46da701f8c674c1ebae7feb4dc19898d8b999eaa9010cba1ff408ac569959c073f9730e0251125673a1e3
 DIST lsyncd-2.0.7.tar.gz 141498 SHA256 3c76a6e8acfceea742154afd21f74b220277e54b1ffdb71ee1dc2eb104b0bbde SHA512 4ba99853b7962f40bd6a7cd2b51eebf33b37a9536511d39f5650da04465c67080cc89568537981165c357c76841221c1fcc83b42ee0d8ab4713619f8c008af40 WHIRLPOOL 549fa8603510b197174609308ee2b4ccf8d5cfba2bd20c4450ca770d477f16d0fa0aa7e5bd50440d1b94dcb97ffd38a7ef40f8a7bd1b002b4955a42c7b1edf4f
 DIST lsyncd-2.1.4.tar.gz 150852 SHA256 cfafe0a332369e3914c7089915abadef154e3448ab443165ba87d21cc0d96a20 SHA512 a8ac9fe5c469c1de2ac530badf8d8e5b2f284fa5e69f9d687ed05b2768334e174523be4fba03dd39624b0d0c5be26ea4b61235d24fbffc8e7c407780c0e5ce9c WHIRLPOOL 68f60aff1d8cee53dbbb3224654e94a4c874f671c4b0f615d12cf86f45cf12cfa3b91cc50c8eb013c8d72569997ecc57e79f293162dcfea4a5ebb6122b3380b2
+DIST lsyncd-2.1.5.tar.gz 149873 SHA256 4a793056c4ed833edb59436d7711bb65f7e38a4d8d44371cc9dc5eb91fbc461f SHA512 7be939e979525f8e4687432ffe952b1d09b8a34b4d7f92ebe86b5cddb765dbd602258682612529e9cc51305d6d001e72de9e6da62761397df23ecda30fd6a12b WHIRLPOOL 3b5405759542b9a97253fcbc3c66d8005c44045e76527ae645cbaa04cf570f4a5f44a863632b5fc17cba215253743cf0fac8a39cbca488d3b5bfc58a82948ee8

app-admin/lsyncd/lsyncd-2.1.5.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/app-admin/lsyncd/lsyncd-2.1.5.ebuild,v 1.1 2013/06/10 05:28:55 radhermit Exp $
+
+EAPI=5
+
+DESCRIPTION="Live Syncing (Mirror) Daemon"
+HOMEPAGE="http://code.google.com/p/lsyncd/"
+SRC_URI="http://lsyncd.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	net-misc/rsync"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${P}
+}

app-arch/gzip/Manifest

@@ -1,2 +1,3 @@
 DIST gzip-1.4.tar.gz 907411 SHA256 d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee SHA512 9ba6d11f0469b80433a5da25f834f7652db109c235e2a849f4249adae3929fda9ebef98a181cc928a5dfc2b0d35df8b220afba130cd4a596a4dbddbf3fe8d2bc WHIRLPOOL 3d8552d2dc660953714f49674e8af2319eade0fd33c705ee253c2ea215cf4e5c3e6b7088c7087060ea7751508c74769b5b64d9e88bc22ea1d7ad0e8680a616e5
 DIST gzip-1.5.tar.xz 720956 SHA256 9ac20a3841a1246a8bedd800ea1fb93ef76521535d89cb59397d267026b6a173 SHA512 27b1b9c1ab75331b5368abb54541f3f251009a3bc6e49e42cda13bc088673d9f8c89c55caa63da60c1ea70fac2e6de24203b7aeaaaad4bc54302edbe275f46ea WHIRLPOOL c718e5e4e0e6f29de285380c25564997615b7213fa32604922436c3c6221bb9531d01518a6cc4e0a80b4694bb040768654d4bf07bb48290f90e61f13962e96ab
+DIST gzip-1.6.tar.xz 725084 SHA256 37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847 SHA512 06da599fc38b459d7e9a3f43fdd06d1a0d7b29ad14cb7b6552176bab584a1135bb47ba37a4eb377e6c42c4934d557079ace1e289a252ae192ee154079a62ed01 WHIRLPOOL 7c639d9a57d5f9a820972275c7813ccd76df7a87ad68b00668696aec251b84fd7efb1129205e8a7cd51e40706b718ce3ce71dc9aa6626acf074bcea6f0fe5c39

app-arch/gzip/gzip-1.6.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v 1.1 2013/06/11 03:07:21 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="http://www.gnu.org/software/gzip/"
+SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
+	mirror://gnu/gzip/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="pic static"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
+}
+
+src_configure() {
+	use static && append-flags -static
+	# avoid text relocation in gzip
+	use pic && export DEFS="NO_ASM"
+	econf
+}
+
+src_install() {
+	default
+	docinto txt
+	dodoc algorithm.doc gzip.doc
+
+	# keep most things in /usr, just the fun stuff in /
+	dodir /bin
+	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
+	sed -i -e 's:/usr::' "${ED}"/bin/gunzip || die
+}

app-arch/gzip/metadata.xml

@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+ <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id>
+</upstream>
 <use>
 <flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 </use>

app-arch/innoextract/innoextract-1.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 2013-2013 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/innoextract/innoextract-1.4.ebuild,v 1.1 2013/03/11 19:12:15 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/innoextract/innoextract-1.4.ebuild,v 1.2 2013/06/10 12:39:05 nimiux Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://github/dscharrer/InnoExtract/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="c++0x debug doc +lzma static"
 
 RDEPEND="

app-arch/pixz/Manifest

@@ -1,2 +1 @@
 DIST pixz-1.0.2.tgz 21425 SHA256 af9dac41edd6bf57953471f7fcbd4793810003bf911593ba4c84f7cccb5f74af SHA512 ea3f37b725a0f08e87a6bc0af19522e92bb5b34fad49cfbfcc04e7054f4537cb09c8f3b56abda7f6d27ce64535b158a676a9e69f92141190840bd9ba255961f3 WHIRLPOOL 76b8af8833b9d87718b0a1fa5f596f6aa820b176b17cbde25f7cd0cf1f6b0cdce6c4d7b7c3d82b3f7b018a60bd6ce1ae6f43263875f0eeef5c93ae889856c60e
-DIST pixz-1.0.tar.gz 17736 SHA256 912c60de88f7eca2e1c6fe13eec5371f723018dca933796c47cd50bf6a349fc9 SHA512 5b0df7ed8ff4c54ffe899decd1f0874aa7a0245cd4968f416c457508583c9048f483592ac933620b2325815052803508a2bf0d70ab679333288e5249c0dbc5c2 WHIRLPOOL 5b6ea1fc5d66ccab4bf07ecf291c6110abc73dc46ced312eb564c7bad950052d4f214563df72bb04eb2d723f0b1b1ece71c2aa59d3d4a2fa480b4fb740cdbb98

app-arch/pixz/pixz-1.0.2.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.2.ebuild,v 1.3 2013/02/18 01:00:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.2.ebuild,v 1.4 2013/06/10 17:23:29 zerochaos Exp $
 
-EAPI=4
+EAPI=5
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -22,7 +22,7 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="static"
 
-LIB_DEPEND=">=app-arch/libarchive-2.8[static-libs(+)]
+LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
 	>=app-arch/xz-utils-5[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}

app-arch/pixz/pixz-1.0.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.ebuild,v 1.2 2012/12/06 03:09:11 vapier Exp $
-
-EAPI=4
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Parallel Indexed XZ compressor"
-HOMEPAGE="https://github.com/vasi/pixz"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/vasi/pixz.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="mirror://github/vasi/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="static"
-
-LIB_DEPEND=">=app-arch/libarchive-2.8[static-libs(+)]
-	>=app-arch/xz-utils-5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-src_configure() {
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" OPT=""
-}
-
-src_install() {
-	dobin pixz
-	dodoc README TODO
-}

app-arch/pixz/pixz-9999.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-9999.ebuild,v 1.5 2013/01/11 01:55:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-9999.ebuild,v 1.6 2013/06/10 17:23:29 zerochaos Exp $
 
-EAPI=4
+EAPI=5
 
 inherit toolchain-funcs flag-o-matic
 
@@ -12,7 +12,7 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="static"
 
-LIB_DEPEND=">=app-arch/libarchive-2.8[static-libs(+)]
+LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
 	>=app-arch/xz-utils-5[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}

app-crypt/gnupg/gnupg-2.0.20.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-crypt/gnupg/gnupg-2.0.20.ebuild,v 1.4 2013/06/09 16:01:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.20.ebuild,v 1.5 2013/06/10 11:49:55 pinkbyte Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
 
 COMMON_DEPEND_LIBS="

app-doc/root-docs/Manifest

@@ -1,4 +1,4 @@
 DIST root_v5.32.03.source.tar.gz 55529362 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 SHA512 2e067eb9c6bbda5cf4df6973a3cf5307540247fb07c349f7ee74c0cf6a4abbb63f585a9ff67139cae985250fc5c5106b5ea03d7d9d2bcd20269e0ec8760ebd02 WHIRLPOOL 87dbf6f55f82001e07afc3b467e95f841f185f1f67d1dbd953f73e8aa9127ef8485db84100d6e9a08f0ae6aa5b45a565398eb6723145fff16c07e5158bb3e3ab
 DIST root_v5.32.04.source.tar.gz 55526502 SHA256 0c0130ba3d74b86caee3071deeceb46545cfde34def8ad2107601e133506acf2 SHA512 796d7f6fe92700232da3fcaac042438e13c13e504179a7375105b2ff06e1fac571ef4d59f270d73844b2a481b0762a873985d22eee2b1a0b156071b777d4417a WHIRLPOOL c5ce0f81331e08b3f79e97c894bff60185bba562388e789d3d1716d3523045a55c24e1cebded4ad19a09023c4b5275fd7d44acb726a1f248a9616ed95addd609
-DIST root_v5.34.05.source.tar.gz 64021235 SHA256 448e180a5ed6f53b5ee49ead014a98e742e97198a4ca760f086467db5d230c9d SHA512 37d26849114c7764b8cb877e29f5e3b24603680b317ceab52d784ca2c17d66f38e99dfa1b369e587517ea5ffd4a11cefe51eb84db47d767ad16aee12b7ce79bf WHIRLPOOL 195f32c1251088ff55a5c7834bc3db3d07a4fbcfff018f329e6c39c6618aa98b7f3c2f6a0f7aba883367a016ca260c0c061c7641caa75c8c6e077cad0bb43516
 DIST root_v5.34.07.source.tar.gz 66629870 SHA256 88aa3fdd6c9b1cce33062b53c405a3ac0fb776d37d2a544aef5c71917f2adb4d SHA512 e062fdf3bbd1d81d777faccaf1ed6f603e2f9d4ee4926bdf671caf38f42b52b1a23d8ea87772d809978462f12474a1c5ad52005603b22162b9d566951fe7123e WHIRLPOOL 4519e26fb444d674e888d7aa08eae0ad98300d65fbf9a40f19d9da37be7cf19d15db98807941c426fb8407e30f99ecde98f09bd2f0cbf355b717f12f0369e35e
+DIST root_v5.34.08.source.tar.gz 66508773 SHA256 79228cbe5fdfce0ab861b3cba48263d841f0ed04aaf721fb82e246aa567e4011 SHA512 2731b282f45d7a6462ec011ff773224df60fb55140c60f7685afbcd86eec2debbc76fac631fa5e87b3b7893417d8e51a3794c3e017b76dac8206188fb1e0b33f WHIRLPOOL 889ecc8cf5f27e9887c28367645fde8e621a2045a646b4308d132b6a63ca9e138e0718207f265696a146c9e47122384afbcf690bd02e59ba5880b69267502c21

app-doc/root-docs/root-docs-5.34.08.ebuild

@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.05.ebuild,v 1.1 2013/02/25 04:44:12 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.08.ebuild,v 1.1 2013/06/10 16:46:22 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 ROOT_PN="root"
 PATCH_PV="5.34.01"
 
 if [[ ${PV} == "9999" ]] ; then
-	_SVN_DEP="dev-vcs/subversion"
+	_GIT=git-2
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit eutils multilib toolchain-funcs virtualx
+inherit eutils multilib toolchain-funcs virtualx ${_GIT}
 
 DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
 HOMEPAGE="http://root.cern.ch/"
@@ -25,36 +25,15 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE=""
 
-S="${WORKDIR}/${ROOT_PN}"
+S="${WORKDIR}/${ROOT_PN}-v5-34-00-patches"
 VIRTUALX_REQUIRED="always"
 
 DEPEND="
 	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
 	virtual/pkgconfig
-	${_SVN_DEP}"
+	${_GIT_DEP}"
 RDEPEND=""
 
-pkg_setup() {
-	# sandboxed user can't access video hardware, so xorg-x11 implementation
-	# should be used
-	GL_IMPLEM=$(eselect opengl show)
-	eselect opengl set xorg-x11
-}
-
-src_unpack() {
-	# can't use subversion eclass functions,
-	# we need to svn export the same root tree:
-	# 1) svn revisions for root and root-docs must be the same;
-	# 2) no need to abuse server twice.
-	if [[ ${PV} == "9999" ]] ; then
-		addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
-		svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
-			"${S}" || die "svn export failed"
-	else
-		default
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
 }
@@ -78,6 +57,10 @@ src_configure() {
 }
 
 src_compile() {
+	# video drivers may want to access hardware devices
+	cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+	[[ -n "${cards}" ]] && addpredict "${cards}"
+
 	ROOTSYS="${S}" Xemake html
 	# if root.exe crashes, return code will be 0 due to gdb attach,
 	# so we need to check if last html file was generated;
@@ -91,7 +74,3 @@ src_install() {
 	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
 	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
 }
-
-pkg_postinst() {
-	eselect opengl set ${GL_IMPLEM}
-}

app-editors/qxmledit/qxmledit-0.8.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/app-editors/qxmledit/qxmledit-0.8.5.ebuild,v 1.2 2013/05/29 10:58:16 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.5.ebuild,v 1.3 2013/06/10 09:25:32 pinkbyte Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND=">=dev-qt/qtcore-4.7:4

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

@@ -1,93 +0,0 @@
-# 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-9999.ebuild,v 1.12 2013/05/24 02:45:24 patrick Exp $
-
-EAPI=4
-
-#BACKPORTS=
-
-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=""
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
-		${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="~amd64 ~x86"
-	VIRTINSTDEP=">=app-emulation/virtinst-0.600.0-r2"
-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/wine/Manifest

@@ -34,6 +34,7 @@ DIST wine-1.5.6.tar.bz2 20380981 SHA256 b178bc34a69341a8f0a7ff73f7dadf2562ed2e5e
 DIST wine-1.5.7.tar.bz2 20386078 SHA256 c4cafaa6e8f67d548ee5f35cd486699350404b02b448dd8fd48d664b9c5f0b07 SHA512 2809ae5cf8695d0feefcee33d3ffb4bed58ad8a32edcee1fb9d1580f4f9dc2f9123a8f169284595f9041f8ffaa7e7fdbef4f6195de00d47f469f527d6764708d WHIRLPOOL e8783abb6a33ecb37d121f4f8b2b1f2d4ecdb57fbd0e53e3aaf4a157fc85ae150e245ddb9b238d533f3a9a6f565caf2ffdd0deab0d76d666b1ac3fb9d08e0b8b
 DIST wine-1.5.8.tar.bz2 20383248 SHA256 dff2bb0026dc155c0c8ae4fd4f87d4a9cd40496286af6ed05130c87d514fc543 SHA512 b34af3f5f26edf6a13e67d699247a82c1998eed8f28e495a65265f700b6fca436824f5bcebd52393d095e13564202874e420285044fa2feaca0a303e89d14f04 WHIRLPOOL 9844388a738ba6bfd88a5ca4b97f6f7902d66e7b3bc5054d642cfa6660ed2e5f861e8c67fb2351fb7afb2a7a9350ce87127b7f84022a72678336e3891e957ad9
 DIST wine-1.5.9.tar.bz2 20413229 SHA256 7bc25e7d0d8fec11a41fec89994dd65265b8fd1052ee82d5648232e646899cd3 SHA512 245b3819f6ca17f50ffedbac44e55a367cff16e3c0c3b28f701511e79c2c20d596e0ae7d4a4094c7203589915cf048e023dedbba9439e1e81bcc7681176dd33b WHIRLPOOL b10bb0606bb013f1a84e8bcfee184eb860d3df8be10b27ef7208d2eb73ed5b1a233be7be3831b61967cac11aa5ad76ab01e1638af860e6426347aec6c45d7c83
+DIST wine-1.6-rc1.tar.bz2 22294223 SHA256 7656c3600eaf5bb3eda05750f10f3f57954eaf11f7b8b2cb05507dc9e3ef245f SHA512 e357abd9be4a0b65ec590bf57317464f01440075db3b7d27425ba712d44fbcd6b3a505143bbe3a4f24406d5f5d7f6afffc57caaed183deb40bdf1b523768c4d2 WHIRLPOOL e48cb171f4ab2c4c127c1b3786274b113f70fcbd9c763622bceaeb160dc650d54bba086b1c8e7e1c73aaefd367d31d71f35d02f7eba84fd12c9f6367c7d756f7
 DIST wine-gentoo-2012.11.24.tar.bz2 57481 SHA256 164248d7ff8cf06053576a3ecc1f6fe88a52763b04058ae53a9a4d5cfb6e7e22 SHA512 2a626ccbd408204dc6d1710ebb524a7961f4f417abc4cf1b65b4954a7b3033592febc8e9886ab47b000fc97dd3fe016a5833079f6bff84cd1d5aeb57a5167e07 WHIRLPOOL c638d0b0d8632d99f34cc4a294c4ddc7b69812af2ef536b3586fcfb41aab88a545d4c85c5a41020911dcb244eb7ed512cc6a957c6efd7ed06bd840f38e91f61d
 DIST wine-mono-0.0.4.msi 44408320 SHA256 15d8a612cdeca4eff3137353f29fdeb7a99e055cd633844c91cd00e0186b8882 SHA512 a7a3d5a564bab68ec6f3b96dff53c7b1491ce6d53b9fa3c2f5770e3ada69ffdefcbdde340697e9916d8c487f748db22aae97803b21bd63e461149be1eac096e4 WHIRLPOOL dc3bfafb8768cbda124870fceb1389e34a7d8ff0b1bad3df7e05923ce2695a2b037467bfddd90e1726f3f64f79bfa9f64bf65054ae3355a69039026fabf1eb4a
 DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 d3009f2301b0a006136e880025a736f24612faa7a954956896124ec7282d35b678f02658e8be12b1c02ee217e594a2c728a9258c36ccb346b186a4781951adbd WHIRLPOOL 1d4b2e88ebab1f603326a238cc908982c7e135a33340087e8645572838d2b6034764e9fe787bb890792dea4c0531d26f9a6a811a7c200edb99ab82f975179389
@@ -69,3 +70,4 @@ DIST winepulse-patches-1.5.22.tar.bz2 46325 SHA256 4850ffb54ee4062c14457a6282b43
 DIST winepulse-patches-1.5.23.tar.bz2 46597 SHA256 11786926ab0d519a96d488d968ef510ca8a8aadef45d34a155476fb310c03864 SHA512 a429ec080d92c9fa373feace4534c922c19840c131aae75eda3b662f5ced5773843ccab144324184ce38e4fb65ddf48b73724c9006018bad7ae1ebc396db7271 WHIRLPOOL 8d87feb598e749ce10875d2e72a38e2a82c5ca6dc3528c9784fd71c2d70d98955424c6580e102fe512bcccc8804e70f40f45e45828b497c5789f2df9bf009400
 DIST winepulse-patches-1.5.25.tar.bz2 46795 SHA256 375c94dc4d12ab6b41da478104a1ca1f9c36d4d7d111f74d005900c8f04e3026 SHA512 1e2f6029cce6feb75fd9f170f0fa791b8b4f5d5e7c852e835c60d6dcb4e3319ed671b9eec2767cde7d8befe96a7fb1970f581efbc2b5d1b6277bb69e7f7e89a3 WHIRLPOOL e2cc043d21a36117a8de69597e61148edbf3b49ede1a95bc196693c47235efbb5a97c7f8964dc4906ece6a982bfce4cb156e4428a2c88c82cfa7cb4e82892503
 DIST winepulse-patches-1.5.30.tar.bz2 45835 SHA256 61f7cdee2c5cb21457a721752a4525c1c75257b18a3b19793934622136231a35 SHA512 90f2c4fd989260131570a5cc18f7304f641d7738bcafd284e1dae19767a8dfebd289c458eaba8efadef8a9dd9552f4a34be34f22d70b841484b0245559975f80 WHIRLPOOL 60fea09353f33f54ef4b19d34876ad307c17d6beab3733f439a5b2714c8de51bd8c69f0f7180f31e0378d857c0f1d1fcbb6f54fc2985f36b0dce9e37e0123d5f
+DIST winepulse-patches-1.6-rc1.tar.bz2 47873 SHA256 c963b08e520aafdc618caaa50044979ec573aa1862bc0637f1f4e381b3fc3665 SHA512 f5f9cbcb93ffcec8dc43bd8949d7f7ee71ab75771dc04ee1e28c3b4ba2ab3d7f7089ae2f872aed835979a94e51563e65e6fd8333104617c8e0465525c2854654 WHIRLPOOL ec38890c71a3e40d433c8e99f483f2453c2e88119d824aabebbc9c6cc95b3585ee8e1d47e1a00df795d6b731d041fd7e1b987781b76b66bf0dbf9f7cac4642e3

app-emulation/wine/files/wine-1.6_rc1-pkg-config.patch

@@ -0,0 +1,249 @@
+From 4a2e919fb7e425adc4d58c4c4c00e3e32ac1709a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 10 Jun 2013 23:29:48 -0400
+Subject: [PATCH] configure: always check for pkg-config (Bug 33780)
+
+AC_REQUIRE([WINE_PATH_PKG_CONFIG]) in WINE_PACKAGE_FLAGS is not
+sufficient because it gets expanded only at the first occurrence of
+WINE_PACKAGE_FLAGS in configure.ac's text - which happens to be inside a
+shell conditional.
+---
+ configure    | 188 +++++++++++++++++++++++++++++------------------------------
+ configure.ac |   1 +
+ 2 files changed, 95 insertions(+), 94 deletions(-)
+
+diff --git a/configure b/configure
+index 3a551e8..670c4a4 100755
+--- a/configure
++++ b/configure
+@@ -672,7 +672,6 @@ XSLT_LIBS
+ XSLT_CFLAGS
+ XML2_LIBS
+ XML2_CFLAGS
+-PKG_CONFIG
+ X_EXTRA_LIBS
+ X_LIBS
+ X_PRE_LIBS
+@@ -711,6 +710,7 @@ CPP
+ OPENGL_LIBS
+ XLIB
+ MAINTAINER_MODE
++PKG_CONFIG
+ MSGFMT
+ ICOTOOL
+ CONVERT
+@@ -5152,6 +5152,98 @@ fi
+ done
+ test -n "$MSGFMT" || MSGFMT="false"
+ 
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$PKG_CONFIG"; then
++  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_PKG_CONFIG"; then
++  ac_ct_PKG_CONFIG=$PKG_CONFIG
++  # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_PKG_CONFIG"; then
++  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
++if test -n "$ac_ct_PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
++$as_echo "$ac_ct_PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_PKG_CONFIG" = x; then
++    PKG_CONFIG=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    PKG_CONFIG=$ac_ct_PKG_CONFIG
++  fi
++else
++  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
++fi
++
+ 
+ if test "x$enable_maintainer_mode" != "xyes"
+ then
+@@ -9500,99 +9592,7 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op
+ if test "x$with_xml" != "xno"
+ then
+     ac_save_CPPFLAGS="$CPPFLAGS"
+-    if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
+-
+-if test -n "$XML2_CFLAGS"; then :
++    if test -n "$XML2_CFLAGS"; then :
+ 
+ elif test -n "$PKG_CONFIG"; then :
+   XML2_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`
+diff --git a/configure.ac b/configure.ac
+index 57d76d9..5f3f98a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -288,6 +288,7 @@ AC_CHECK_PROGS(RSVG, rsvg, false)
+ AC_CHECK_PROGS(CONVERT, convert, false)
+ AC_CHECK_PROGS(ICOTOOL, icotool, false)
+ AC_CHECK_PROGS(MSGFMT, msgfmt, false)
++WINE_PATH_PKG_CONFIG
+ 
+ if test "x$enable_maintainer_mode" != "xyes"
+ then
+-- 
+1.8.2.1
+

app-emulation/wine/wine-1.6_rc1.ebuild

@@ -0,0 +1,319 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6_rc1.ebuild,v 1.1 2013/06/11 04:12:24 tetromino Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-multilib eutils flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.21"
+MV="0.0.8"
+PULSE_PATCHES="winepulse-patches-1.6-rc1"
+WINE_GENTOO="wine-gentoo-2012.11.24"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +X xcomposite xinerama xml"
+[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
+	udisks? (
+		sys-apps/dbus
+		sys-fs/udisks:2
+	)
+	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups:= )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC:= )
+	osmesa? ( media-libs/mesa[osmesa] )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( net-libs/gnutls:= )
+	png? ( media-libs/libpng:0= )
+	v4l? ( media-libs/libv4l )
+	xcomposite? ( x11-libs/libXcomposite )
+	amd64? (
+		abi_x86_32? (
+			gstreamer? (
+				app-emulation/emul-linux-x86-gstplugins
+				app-emulation/emul-linux-x86-medialibs[development]
+			)
+			truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] )
+			X? (
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
+				>=app-emulation/emul-linux-x86-soundlibs-2.1[development]
+			)
+			mp3? ( app-emulation/emul-linux-x86-soundlibs[development] )
+			odbc? ( app-emulation/emul-linux-x86-db[development] )
+			openal? ( app-emulation/emul-linux-x86-sdl[development] )
+			opengl? ( app-emulation/emul-linux-x86-opengl[development] )
+			osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] )
+			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
+			v4l? ( app-emulation/emul-linux-x86-medialibs[development] )
+			>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+			>=sys-kernel/linux-headers-2.6
+		)
+	)"
+[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	pulseaudio? (
+		media-sound/pulseaudio
+		sys-auth/rtkit
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+src_unpack() {
+	if use abi_x86_64; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if use abi_x86_32 && use opencl; then
+		[[ x$(eselect opencl show) = "xintel" ]] &&
+			die "Cannot build wine[opencl,abi_x86_32]: intel-ocl-sdk is 64-bit only" # 403947
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+
+	unpack "${PULSE_PATCHES}.tar.bz2"
+	unpack "${WINE_GENTOO}.tar.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308
+		"${FILESDIR}"/${PN}-1.5.31-gnutls-3.2.0.patch #http://bugs.winehq.org/show_bug.cgi?id=33649
+		"${FILESDIR}"/${PN}-1.6_rc1-pkg-config.patch #http://bugs.winehq.org/show_bug.cgi?id=33780
+	)
+	[[ ${PV} == "9999" ]] || PATCHES+=(
+		"../${PULSE_PATCHES}"/*.patch #421365
+	)
+
+	autotools-utils_src_prepare
+
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+do_configure() {
+	local myeconfargs=(
+		"${myeconfargs[@]}"
+		CCAS="$(tc-getAS)"
+	)
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myeconfargs+=( --enable-win64 )
+		else
+			myeconfargs+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	local myeconfargs=( # common
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_with mp3 mpg123)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with png)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
+
+	multilib_parallel_foreach_abi do_configure
+}
+
+src_compile() {
+	autotools-multilib_src_compile depend
+	autotools-multilib_src_compile all
+}
+
+src_test() {
+	if [[ $(id -u) == 0 ]]; then
+		ewarn "Skipping tests since they cannot be run under the root user."
+		ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+		return
+	fi
+
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	multilib_toolchain_setup x86
+	local BUILD_DIR="${S}-${ABI}"
+	cd "${BUILD_DIR}" || die
+	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
+}
+
+src_install() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	autotools-multilib_src_install
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

app-emulation/wine/wine-9999.ebuild

@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.142 2013/05/26 04:27:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.143 2013/06/11 04:12:24 tetromino Exp $
 
 EAPI="5"
 
 AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
 inherit autotools-multilib eutils flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
@@ -24,7 +24,7 @@ fi
 
 GV="2.21"
 MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.5.30"
+PULSE_PATCHES="winepulse-patches-1.6-rc1"
 WINE_GENTOO="wine-gentoo-2012.11.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -172,6 +172,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308
 		"${FILESDIR}"/${PN}-1.5.31-gnutls-3.2.0.patch #http://bugs.winehq.org/show_bug.cgi?id=33649
+		"${FILESDIR}"/${PN}-1.6_rc1-pkg-config.patch #http://bugs.winehq.org/show_bug.cgi?id=33780
 	)
 	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365

app-i18n/man-pages-ja/man-pages-ja-20130215.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-i18n/man-pages-ja/man-pages-ja-20130215.ebuild,v 1.1 2013/02/18 06:52:14 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild,v 1.3 2013/06/10 12:05:45 pinkbyte Exp $
 
 EAPI="3"
 GENTOO_MAN_P="portage-${PN}-20060415"
@@ -12,7 +12,7 @@ SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
 
 LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"

app-i18n/man-pages-ru/Manifest

@@ -1,2 +1,2 @@
-DIST man-pages-ru_3.27-2066-1435-20101003.tar.bz2 377019 SHA256 b6d5cebf506ea7e100f5c0f1e66c17f13cb61e42d6214cc5a7489a43da3c593b SHA512 9df89207a335488fa15a746171a922bb93480463ffc1dbe9d0997f218d0f8dcab3ee713e6e6ce80d9eb2da99e256f031c0506d6e0da97ef23a03352eff65e551 WHIRLPOOL e28e5af2b5d492cc9091f82ec6b8392fe9dbc6cd4d5ebbe53f474f46536267495777d507ddcb7a56da6e9a5540524359d28bfbf6bc5123f1afd29989d2f4f10f
 DIST man-pages-ru_3.41-2145-1724-20130102.tar.bz2 669902 SHA256 23e76ba0025616b3670716363227440e6fdda17bd8498be5beb565561b25f8ba SHA512 1bc37cbea0ee559985f2ded4dec136e5b178db26d25d571fe9fbf10f611d91be65d08973b5d9a2db1e80aa1da3f0b54ae6a28a8b6d63ac0c559f606e4779e403 WHIRLPOOL ea224a6182c1de420a75e5a851bae9ddf3522ed14a053d9ad835fb156301410bb392c704273a205421ab50bd27f264dcc2da9c95fb4ad1889e6fb708a1cd8845
+DIST man-pages-ru_3.49-2170-1764-20130606.tar.bz2 727102 SHA256 a0e8d5960511786aa2ed377471f265c8c6153cb82f01a0a1ab8d58fadd6336a4 SHA512 de428e1382b99211ad20a5ff47a41dfd78b0c8356725f0264412dbd15f89f3dcb67f7493de1eefe4b0ce897860884733f1bbf4628c9b9ef972a3ac5ccdf4421d WHIRLPOOL e049d78bd7c1479c7baf205f39e9ba7e8e05f443b9e1a70bbd8e0b2c1baf549c9e6cc10d82698897690a4905fd4fac6e8f1a173ca5d446d01eaf7ee4efe311ea

app-i18n/man-pages-ru/man-pages-ru-3.49.2170.1764.20130606.ebuild

@@ -1,11 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.27.2066.1435.20101003.ebuild,v 1.10 2013/04/23 16:36:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.49.2170.1764.20130606.ebuild,v 1.1 2013/06/10 12:16:53 pinkbyte Exp $
+
+EAPI="5"
 
-EAPI="2"
 inherit versionator
 
-MY_PV=$(replace_version_separator 1 . $(replace_all_version_separators -))
+MY_PV="$(replace_version_separator 1 . $(replace_all_version_separators -))"
 
 DESCRIPTION="A collection of Russian translations of Linux manual pages"
 HOMEPAGE="http://man-pages-ru.sourceforge.net/"
@@ -13,16 +14,16 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
 
 LICENSE="FDL-1.3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
 RDEPEND="virtual/man"
 
-S=${WORKDIR}/${PN}_${MY_PV}
+S="${WORKDIR}/${PN}_${MY_PV}"
 
 src_install() {
 	insinto /usr/share/man/ru
-	doins -r man* || die "doins"
-	dodoc README || die
+	doins -r man*
+	dodoc README
 }

app-misc/bfm/bfm-1.2-r2.ebuild

@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bfm/bfm-1.2-r2.ebuild,v 1.1 2013/06/10 07:13:53 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="File manager and first person shooter written in Java3D, you remove files by shooting at them"
+HOMEPAGE="http://bfm.webhop.net"
+SRC_URI="http://bfm.webhop.net/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/sun-java3d-bin:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PVR}-build.xml ./build.xml || die
+
+	mkdir lib || die
+	pushd lib
+		java-pkg_jar-from sun-java3d-bin
+	popd
+
+	epatch "${FILESDIR}"/${PVR}-package.patch
+
+	mkdir -p net/webhop/bfm || die
+	mv src/* net/webhop/bfm/ || die
+}
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+	local java3d="sun-java3d-bin"
+
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher ${PN} --main net.webhop.bfm.Bfm
+
+	insinto /etc/bfm
+	doins "${S}/bfm.conf"
+
+	if use doc; then
+		dodoc README ChangeLog bindings NEWS
+		java-pkg_dohtml -r docs/*
+	fi
+
+	use source && java-pkg_dosrc src/*
+}
+
+pkg_postinst() {
+	elog "A system wide config file has been installed to /etc/bfm/bfm.conf"
+	elog "Copy the file to ~/.bfm/bfm.conf to set local settings"
+	echo
+	ewarn "Be sure to run bfm in safe mode if you don't want to delete files"
+}

app-misc/bfm/files/1.2-r2-build.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+
+<project name="bfm" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="net" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs" />
+	<property name="dist.dir" value="dist" />
+	<property name="lib.dir" value="lib" />
+	<property name="jarfile" value="${dist.dir}/${ant.project.name}.jar" />
+	<property name="target.jdk" value="1.4" />
+
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${build.dir}" />
+		<mkdir dir="${docs.dir}" />
+	</target>	
+
+	<!-- classpath -->
+	<path id="refcp">
+                <fileset dir="${lib.dir}">
+                        <include name="**/*.jar" />
+                </fileset>
+        </path>
+	
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<mkdir dir="${build.dir}" />
+		<javac srcdir="${src.dir}" 
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"
+			classpathref="refcp" />
+
+		<copy todir="${build.dir}">
+			<fileset file="${src.dir}/webhop/bfm/data" />
+		</copy>
+		<copy todir="${build.dir}/net/webhop/bfm/data">
+			<fileset dir="${src.dir}/webhop/bfm/data" />
+		</copy>
+	</target>
+
+	<!-- build the jar file -->
+	<target name="jar" depends="compile">
+		<jar jarfile="${jarfile}" basedir="${build.dir}"
+			manifest="${src.dir}/webhop/bfm/data/manifest" />
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="docs" depends="init">
+		<javadoc sourcepath="."
+			packagenames="*"
+       		destdir="${docs.dir}"
+       		author="true"
+       		version="true"
+       		use="true"
+       		windowtitle="${ant.project.name} API" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>

app-misc/bfm/files/1.2-r2-package.patch

@@ -0,0 +1,313 @@
+diff -urN a/src/Bfm.java b/src/Bfm.java
+--- a/src/Bfm.java	2005-02-22 03:07:39.000000000 +0100
++++ b/src/Bfm.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import javax.swing.*;
+ import com.sun.j3d.utils.universe.*;
+diff -urN a/src/Blood.java b/src/Blood.java
+--- a/src/Blood.java	2005-01-08 23:45:41.000000000 +0100
++++ b/src/Blood.java	2013-06-10 08:37:16.978094948 +0200
+@@ -26,6 +26,8 @@
+     A big thank to Andrew for letting us use his code!
+ */
+ 
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+ import com.sun.j3d.utils.image.*;
+diff -urN a/src/DroppedDynamite.java b/src/DroppedDynamite.java
+--- a/src/DroppedDynamite.java	2004-12-31 14:23:44.000000000 +0100
++++ b/src/DroppedDynamite.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Dynamite.java b/src/Dynamite.java
+--- a/src/Dynamite.java	2005-02-18 21:24:29.000000000 +0100
++++ b/src/Dynamite.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Explotion.java b/src/Explotion.java
+--- a/src/Explotion.java	2005-02-20 23:55:12.000000000 +0100
++++ b/src/Explotion.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/FSDefault.java b/src/FSDefault.java
+--- a/src/FSDefault.java	2005-01-04 16:02:08.000000000 +0100
++++ b/src/FSDefault.java	2013-06-10 08:37:16.978094948 +0200
+@@ -20,6 +20,8 @@
+ /* FS stands for FileShape but is actually an transformgroup
+ 	 containing the visuall shape of the FileObjet*/
+ 
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/FSDocument.java b/src/FSDocument.java
+--- a/src/FSDocument.java	2005-01-04 16:02:08.000000000 +0100
++++ b/src/FSDocument.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/FSPicture.java b/src/FSPicture.java
+--- a/src/FSPicture.java	2005-02-22 02:29:54.000000000 +0100
++++ b/src/FSPicture.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/FSVideo.java b/src/FSVideo.java
+--- a/src/FSVideo.java	2005-01-04 16:02:08.000000000 +0100
++++ b/src/FSVideo.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/FileObject.java b/src/FileObject.java
+--- a/src/FileObject.java	2005-02-20 23:55:12.000000000 +0100
++++ b/src/FileObject.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/GrapplingHook.java b/src/GrapplingHook.java
+--- a/src/GrapplingHook.java	2005-01-03 06:03:50.000000000 +0100
++++ b/src/GrapplingHook.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Hud.java b/src/Hud.java
+--- a/src/Hud.java	2005-02-21 19:14:18.000000000 +0100
++++ b/src/Hud.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import java.awt.*;
+ import javax.media.j3d.*;
+diff -urN a/src/OpenDialog.java b/src/OpenDialog.java
+--- a/src/OpenDialog.java	2005-02-21 18:36:44.000000000 +0100
++++ b/src/OpenDialog.java	2013-06-10 08:37:16.978094948 +0200
+@@ -16,6 +16,9 @@
+     along with this program; if not, write to the Free Software
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
++
++package net.webhop.bfm;
++
+ import javax.swing.plaf.*;
+ import java.awt.*;
+ import java.awt.event.*;
+diff -urN a/src/Pattern.java b/src/Pattern.java
+--- a/src/Pattern.java	2004-12-31 14:22:27.000000000 +0100
++++ b/src/Pattern.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import javax.vecmath.*;
+ 
+ public abstract class Pattern {
+diff -urN a/src/PatternCircle.java b/src/PatternCircle.java
+--- a/src/PatternCircle.java	2004-12-31 14:22:27.000000000 +0100
++++ b/src/PatternCircle.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import javax.vecmath.*;
+ 
+ public class PatternCircle extends Pattern {
+diff -urN a/src/PhysicsHandler.java b/src/PhysicsHandler.java
+--- a/src/PhysicsHandler.java	2005-02-21 18:36:44.000000000 +0100
++++ b/src/PhysicsHandler.java	2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+ import java.io.*;
+diff -urN a/src/Player.java b/src/Player.java
+--- a/src/Player.java	2005-02-21 18:30:54.000000000 +0100
++++ b/src/Player.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.universe.*; 
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Rocket.java b/src/Rocket.java
+--- a/src/Rocket.java	2004-12-31 14:22:27.000000000 +0100
++++ b/src/Rocket.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/RocketLauncher.java b/src/RocketLauncher.java
+--- a/src/RocketLauncher.java	2005-01-08 01:22:40.000000000 +0100
++++ b/src/RocketLauncher.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Room.java b/src/Room.java
+--- a/src/Room.java	2005-02-20 23:55:12.000000000 +0100
++++ b/src/Room.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+ import java.io.*;
+diff -urN a/src/RoomObject.java b/src/RoomObject.java
+--- a/src/RoomObject.java	2005-02-20 23:55:12.000000000 +0100
++++ b/src/RoomObject.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ 
+ public abstract class RoomObject extends BranchGroup {
+diff -urN a/src/Shotgun.java b/src/Shotgun.java
+--- a/src/Shotgun.java	2005-01-08 01:22:40.000000000 +0100
++++ b/src/Shotgun.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/SniperRifle.java b/src/SniperRifle.java
+--- a/src/SniperRifle.java	2005-02-20 18:16:14.000000000 +0100
++++ b/src/SniperRifle.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Spear.java b/src/Spear.java
+--- a/src/Spear.java	2005-01-03 02:00:41.000000000 +0100
++++ b/src/Spear.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Wall.java b/src/Wall.java
+--- a/src/Wall.java	2005-01-03 20:40:55.000000000 +0100
++++ b/src/Wall.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/Weapon.java b/src/Weapon.java
+--- a/src/Weapon.java	2005-02-21 18:36:44.000000000 +0100
++++ b/src/Weapon.java	2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+ import com.sun.j3d.utils.picking.*;

app-misc/ckermit/ckermit-8.0.211-r4.ebuild

@@ -1,6 +1,8 @@
-# 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-misc/ckermit/ckermit-8.0.211-r4.ebuild,v 1.4 2012/01/03 12:31:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ckermit-8.0.211-r4.ebuild,v 1.5 2013/06/10 17:42:53 vapier Exp $
+
+EAPI="4"
 
 inherit versionator eutils flag-o-matic toolchain-funcs
 
@@ -14,7 +16,7 @@ HOMEPAGE="http://www.kermit-project.org/"
 
 LICENSE="Kermit"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="ncurses"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
@@ -23,10 +25,10 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-cleanup.patch
+	epatch "${FILESDIR}"/${P}-build-wart.patch
+	tc-export_build_env BUILD_CC
 	sed -i -r \
 		-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
 		-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
@@ -34,7 +36,7 @@ src_unpack() {
 }
 
 ck_use() {
-	use $1 && append-cppflags $2 && libs="${libs} $3"
+	use $1 && append-cppflags $2 && libs+=" $3"
 }
 src_compile() {
 	# we don't enable any of the telnet/ftp authentication stuff
@@ -51,24 +53,24 @@ src_compile() {
 		KFLAGS="${CPPFLAGS}" \
 		LIBS="-lcrypt -lresolv ${libs}" \
 		LNKFLAGS="${LDFLAGS}" \
-		linuxa || die
+		linuxa
 }
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man1
 	emake \
-		DESTDIR="${D}" \
+		DESTDIR="${ED}" \
 		BINDIR=/usr/bin \
-		MANDIR="${D}"/usr/share/man/man1 \
+		MANDIR="${ED}"/usr/share/man/man1 \
 		MANEXT=1 \
-		install || die
+		install
+	dodoc *.txt
 
 	# make the correct symlink
-	rm -f "${D}"/usr/bin/kermit-sshsub
+	rm "${ED}"/usr/bin/kermit-sshsub || die
 	dosym /usr/bin/kermit /usr/bin/kermit-sshsub
 
 	# the ckermit.ini script is calling the wrong kermit binary --
 	# the one from ${D}
-	dosed /usr/bin/ckermit.ini
-	dodoc COPYING.TXT UNINSTALL *.txt
+	sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
 }

app-misc/ckermit/files/ckermit-8.0.211-build-wart.patch

@@ -0,0 +1,23 @@
+the wart util is used at build time only, so use BUILD_* so we can cross-compile
+
+--- a/makefile
++++ b/makefile
+@@ -1406,12 +1406,17 @@
+ 
+ ckctel.$(EXT): ckcsym.h ckcdeb.h ckcker.h ckcnet.h ckctel.h ckclib.h
+ 
++BUILD_CC ?= $(CC)
++BUILD_CFLAGS ?= $(CFLAGS)
++BUILD_CPPFLAGS ?= $(CPPFLAGS)
++BUILD_LDFLAGS ?= $(LDFLAGS)
+ wart: ckwart.$(EXT)
+-	$(CC) $(LNKFLAGS) -o wart ckwart.$(EXT) $(LIBS)
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o wart ckwart.$(EXT) $(BUILD_LDFLAGS)
+ 
+ ckcmdb.$(EXT): ckcmdb.c ckcdeb.h ckcsym.h ckclib.h
+ 
+ ckwart.$(EXT): ckwart.c
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o $@ -c $<
+ 
+ ckudia.$(EXT): ckudia.c ckcker.h ckcdeb.h ckucmd.h ckcasc.h ckcsym.h ckcsig.h \
+ 		ckcnet.h ckctel.h ckclib.h

app-misc/misterhouse/misterhouse-2.103.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/misterhouse/misterhouse-2.103.ebuild,v 1.6 2010/01/01 18:18:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/misterhouse/misterhouse-2.103.ebuild,v 1.7 2013/06/10 17:11:51 zlogene Exp $
 
 DESCRIPTION="Mister House, an open source home automation program with X10 support"
 HOMEPAGE="http://misterhouse.sf.net/"
@@ -11,6 +11,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="tk mysql"
 
+QA_PREBUILT="opt/misterhouse/bin/viavoice_server"
+
 RDEPEND="dev-lang/perl
 	tk? ( dev-perl/perl-tk
 		dev-perl/Tk-CursorControl )

app-misc/physlock/Manifest

@@ -1 +1,2 @@
 DIST physlock-0.4.3.tar.gz 12834 SHA256 16c0cff09c06a0c701e6ff6f074690280ff3d14cc02980a007eb66bd93fff1f2 SHA512 bdaa335b9fbc15cc5206f195075c2d2425933012d0fe1a52244bf1137e2af11faa9d0194b3ea46158230991a56c398a9d5dc8f56eee9716306c88adbd28ddd47 WHIRLPOOL 418be6340b98630e5d0d2dd22f2972b7ca3edd241b0fd025349adb5d6af01abffae1e628556bc88793174c25769ed2ecf4a77032928a6afed860e58663444e3a
+DIST physlock-0.4.4.tar.gz 12711 SHA256 792b9167cbda178a04f8cdc490c49529405356d26bb87e5367ef2a964a17b476 SHA512 ed24132c7f41a6dc26c3182dcd1f19155b4e36dcc5f3030a7f9fed61ccf83b764ceb18ed48ff46c6c8972f3fc514c7e6031cf7ae8057602a24dc737950e72c13 WHIRLPOOL e96491208cfc37d3415c540d7257d757556ededdf3b5c5d1caca368b8fc3d457d7bc3bec6bea7c517943b51adf1c260a187533d86ed9abcee4cd866072a3d9ca

app-misc/physlock/files/physlock-0.4.4-makefile.patch

@@ -0,0 +1,16 @@
+--- physlock-0.4.4/Makefile
++++ physlock-0.4.4/Makefile
+@@ -2,10 +2,10 @@
+ 
+ VERSION = 0.4.4
+ 
+-CC      = gcc
++CC      ?= gcc
+ PREFIX  = /usr/local
+-CFLAGS  = -Wall -pedantic -DVERSION=\"$(VERSION)\"
+-LDFLAGS =
++CFLAGS  += -Wall -pedantic -DVERSION=\"$(VERSION)\"
++LDFLAGS +=
+ LIBS    = -lcrypt
+ 
+ SRC = auth.c main.c options.c util.c vt.c

app-misc/physlock/physlock-0.4.4.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/app-misc/physlock/physlock-0.4.4.ebuild,v 1.1 2013/06/10 05:19:03 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="lightweight Linux console locking tool"
+HOMEPAGE="https://github.com/muennich/physlock"
+SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+}

app-misc/vzstats/vzstats-0.3.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-misc/vzstats/vzstats-0.3.2.ebuild,v 1.1 2013/05/25 18:14:22 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vzstats/vzstats-0.3.2.ebuild,v 1.2 2013/06/10 09:43:34 maksbotan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="

app-portage/tatt/tatt-9999.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-portage/tatt/tatt-9999.ebuild,v 1.6 2013/05/03 14:06:36 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/tatt/tatt-9999.ebuild,v 1.7 2013/06/10 14:01:05 tomka Exp $
 
 EAPI=5
 
@@ -11,7 +11,8 @@ inherit distutils-r1 git-2
 
 DESCRIPTION="tatt is an arch testing tool"
 HOMEPAGE="http://github.com/tom111/tatt"
-EGIT_REPO_URI="https://github.com/tom111/tatt.git"
+EGIT_REPO_URI="https://github.com/tom111/tatt.git \
+	git://github.com/tom111/tatt.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,6 +35,8 @@ python_install_all() {
 	distutils-r1_python_install_all
 	if use templates; then
 		insinto "/usr/share/${PN}"
-		doins -r templates || die
+		doins -r templates
 	fi
+	doman tatt.1
+	doman tatt.5
 }

app-text/jmupdf/Manifest

@@ -0,0 +1,2 @@
+DIST 2012-01-24-src-jmupdf-0.3.0.7z 4171032 SHA256 e2687e779de545c3c0692e3c19cf5ceb70fa1b04ce0dba2e3f5d0956113b817f SHA512 c4c296998f4c837accc5219e617176748f141fef42eb49f1a89638f915331bae0d87684d2e02b590691dae6684095083e329734ecdd578edd6d15ba9981aab5c WHIRLPOOL c6dd8da8452e749c8126ac488ed9ac527f898dcec9c3694a5be529d90a08d08f1362294f567a84075b9595049607619621cbf3b1055f4de7d64e76703e944aac
+DIST 2012-02-23-source-jmupdf-0.4.1.7z 4212084 SHA256 cb7311021dce6e1e7425b088f4d60c12f43c0e26eff794b057d78e105cdbbbc0 SHA512 f16190d02f9c3f6fe9aa2acd7bd270b6e807b61e926cd1bc4e17628f2d62a45d0f024c2748e4eb0a20e7da55895289f6c74685cb371e101a0901235a48eb1f42 WHIRLPOOL e8e93d303e925d1c1313d9951b3306d01abcb9ce1bca50fb40054e807c67f0347ee7c2375de11fde4f957f56fdc98e70620698fb3a02ff8a9f651fb6a21ffe86

app-text/jmupdf/files/jmupdf-0.4.1-build-xml.patch

@@ -0,0 +1,27 @@
+--- jmupdf-0.4.1/jmupdf/build.xml
++++ jmupdf-0.4.1/jmupdf/build.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ 	<project name="jmupdf" default="jmupdf" basedir=".">
+ 
+-		<property name="source.dir" value="${basedir}/bin"/>		
++		<property name="source.dir" value="${basedir}/src"/>		
+ 		<property name="target.dir" value="${basedir}"/>
+ 		<property name="build.dir" value="${basedir}/build"/>
+ 
+@@ -11,9 +11,12 @@
+ 			
+ 			<mkdir dir="${build.dir}"/>
+ 
+-	    	<copy todir="${build.dir}"> 
+-	    		<fileset dir="${source.dir}" includes="**/*"/>
+-	    	</copy>
++			<javac srcdir="${source.dir}"
++				includeantruntime="false"
++				destdir="${build.dir}"
++				debug="on"
++				source="1.5"
++			/>
+ 
+ 			<jar destfile="${build.dir}/jmupdf.jar">
+ 				<manifest>

app-text/jmupdf/files/jmupdf-0.4.1-umlaut.patch

@@ -0,0 +1,11 @@
+--- jmupdf-0.4.1/jmupdf/src/com/examples/pdf/convert/Pdf_2_Png.java
++++ jmupdf-0.4.1/jmupdf/src/com/examples/pdf/convert/Pdf_2_Png.java
+@@ -26,7 +26,7 @@
+ 			 */
+ 			pdfDoc.saveAsPng(
+ 					1,									// Page number
+-					"e:\\tmp\\Lösung.png",				// PNG file
++					"e:\\tmp\\Loesung.png",				// PNG file
+ 					2f,									// Zoom	
+ 					ImageType.IMAGE_TYPE_RGB);		// Color space. Only RGB, ARGB & Gray.
+ 

app-text/jmupdf/jmupdf-0.3.0.ebuild

@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jmupdf/jmupdf-0.3.0.ebuild,v 1.1 2013/06/10 12:22:29 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-2 java-ant-2 multilib
+EANT_BUILD_TARGET=${PN}
+
+DESCRIPTION="Java library for rendering PDF, XPS and CBZ (Comic Book) documents"
+HOMEPAGE="https://code.google.com/p/jmupdf/"
+SRC_URI="https://jmupdf.googlecode.com/files/2012-01-24-src-${P}.7z"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="system-mupdf"
+
+REQUIRED_USE="!system-mupdf"
+
+RDEPEND="system-mupdf? ( >=app-text/mupdf-1.2 )
+	virtual/jdk:1.7"
+DEPEND="${RDEPEND}
+	app-arch/p7zip
+	media-libs/libbmp"
+
+S=${WORKDIR}/${PN}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.4.1-build-xml.patch
+
+	edos2unix ../mupdf/jni/*
+
+	sed -e "/^JVM_INCLUDES/s:=.*:= $(java-pkg_get-jni-cflags):" \
+		-i ../mupdf/MakeJNI2 || die
+	sed -e "s:-pipe -O2::" \
+		-i ../mupdf/Makerules || die
+
+	rm -r ../mupdf/thirdparty || die
+	if use system-mupdf ; then
+		for i in android apps cbz cmaps debian draw fitz fonts ios pdf scripts viewer win32 xps ; do
+			einfo remove mupdf/${i}
+			rm -r ../mupdf/${i} || die
+		done
+	fi
+}
+
+src_compile() {
+	local system-fitz=$(usex system-mupdf "FITZ_LIB=\"${EROOT}usr/$(get_libdir)/libfitz.so\"" "" )
+	emake -C ../mupdf \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		SYS_FREETYPE_INC="$($(tc-getPKG_CONFIG) --cflags freetype2)" \
+		"${system-fitz}" \
+		JNI_DLL=build/libjmupdf.so \
+		JNI_CMD="-shared -Wl,-soname -Wl,lib${PN}.so" \
+		build/libjmupdf.so
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	dolib.so ../mupdf/build/lib${PN}.so
+
+	java-pkg_dojar build/${PN}{,-viewer}.jar
+
+	dodoc Readme
+}

app-text/jmupdf/jmupdf-0.4.1.ebuild

@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jmupdf/jmupdf-0.4.1.ebuild,v 1.3 2013/06/10 11:35:21 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-2 java-ant-2 multilib
+EANT_BUILD_TARGET=${PN}
+
+DESCRIPTION="Java library for rendering PDF, XPS and CBZ (Comic Book) documents"
+HOMEPAGE="https://code.google.com/p/jmupdf/"
+SRC_URI="https://jmupdf.googlecode.com/files/2012-02-23-source-${P}.7z"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="system-mupdf"
+
+REQUIRED_USE="!system-mupdf"
+
+RDEPEND="system-mupdf? ( >=app-text/mupdf-1.2 )
+	virtual/jdk:1.7"
+DEPEND="${RDEPEND}
+	app-arch/p7zip
+	media-libs/libbmp"
+
+S=${WORKDIR}/${PN}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build-xml.patch \
+		"${FILESDIR}"/${P}-umlaut.patch
+
+	edos2unix ../mupdf/jni/*
+
+	sed -e "/^JVM_INCLUDES/s:=.*:= $(java-pkg_get-jni-cflags):" \
+		-i ../mupdf/MakeJNI2 || die
+	sed -e "s:-pipe -O2::" \
+		-i ../mupdf/Makerules || die
+
+	rm -r ../mupdf/thirdparty || die
+	if use system-mupdf ; then
+		for i in android apps cbz cmaps debian draw fitz fonts ios pdf scripts viewer win32 xps ; do
+			einfo remove mupdf/${i}
+			rm -r ../mupdf/${i} || die
+		done
+	fi
+}
+
+src_compile() {
+	local system-fitz=$(usex system-mupdf "FITZ_LIB=\"${EROOT}usr/$(get_libdir)/libfitz.so\"" "" )
+	emake -C ../mupdf \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		SYS_FREETYPE_INC="$($(tc-getPKG_CONFIG) --cflags freetype2)" \
+		"${system-fitz}" \
+		JNI_DLL=build/libjmupdf.so \
+		JNI_CMD="-shared -Wl,-soname -Wl,lib${PN}.so" \
+		build/libjmupdf.so
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	dolib.so ../mupdf/build/lib${PN}.so
+
+	java-pkg_dojar build/${PN}{,-viewer}.jar
+
+	dodoc Readme
+}

app-text/jmupdf/jmupdf-9999.ebuild

@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jmupdf/jmupdf-9999.ebuild,v 1.1 2013/06/10 12:22:29 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic git-2 java-pkg-2 java-ant-2 multilib
+EANT_BUILD_TARGET=${PN}
+
+DESCRIPTION="Java library for rendering PDF, XPS and CBZ (Comic Book) documents"
+HOMEPAGE="https://code.google.com/p/jmupdf/"
+EGIT_REPO_URI="https://code.google.com/p/${PN}/"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS=""
+IUSE="system-mupdf"
+
+REQUIRED_USE="!system-mupdf"
+
+RDEPEND="system-mupdf? ( >=app-text/mupdf-1.2 )
+	virtual/jdk:1.7"
+DEPEND="${RDEPEND}
+	app-arch/p7zip
+	media-libs/libbmp"
+
+src_prepare() {
+	if ! grep javac ${PN}/build.xml >/dev/null ; then
+		epatch \
+			"${FILESDIR}"/${PN}-0.4.1-build-xml.patch
+	fi
+
+	edos2unix $(find mupdf/jni -type f)
+
+	sed -e "/^JVM_INCLUDES/s:=.*:= $(java-pkg_get-jni-cflags):" \
+		-i mupdf/MakeJNI2 || die
+	sed -e "s:-pipe -O2::" \
+		-i mupdf/Makerules || die
+
+	rm -r mupdf/thirdparty || die
+	if use system-mupdf ; then
+		for i in android apps cbz cmaps debian draw fitz fonts ios pdf scripts viewer win32 xps ; do
+			einfo remove mupdf/${i}
+			rm -r mupdf/${i} || die
+		done
+	fi
+}
+
+src_compile() {
+	#append-cflags -Ijni/includes
+	emake -C mupdf \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		SYS_FREETYPE_INC="$($(tc-getPKG_CONFIG) --cflags freetype2)" \
+		JNI_DLL=build/libjmupdf.so \
+		JNI_CMD="-shared -Wl,-soname -Wl,lib${PN}.so" \
+		build/libjmupdf.so
+
+	cd ${PN}
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	dolib.so mupdf/build/lib${PN}.so
+
+	cd ${PN}
+	java-pkg_dojar build/${PN}{,-viewer}.jar
+
+	dodoc Readme
+}

app-text/jmupdf/metadata.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<use>
+	<flag name="system-mupdf">Link against system version of app-text/mupdf</flag>
+</use>
+<longdescription>
+JMuPdf is a Java library for rendering PDF, XPS and CBZ (Comic Book) documents. It can render pages and export them into various formats as well as generate a Java buffered image. It has the ability to render the whole page or sections (cropping). It can also extract page text, links, outlines, etc.
+</longdescription>
+</pkgmetadata>

app-text/mupdf/mupdf-1.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/mupdf/mupdf-1.2.ebuild,v 1.6 2013/06/08 13:07:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.7 2013/06/10 07:22:27 xmw Exp $
 
 EAPI=5
 
@@ -42,6 +42,10 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.2-mubusy_rename_fix.patch \
 		"${FILESDIR}"/${PN}-1.2-pkg-config.patch
 
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
+		-i debian/mupdf.pc || die
+
 	use vanilla || epatch \
 		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
 

app-text/mupdf/mupdf-9999.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/mupdf/mupdf-9999.ebuild,v 1.30 2013/06/08 11:31:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.32 2013/06/10 13:25:12 xmw Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ IUSE="X vanilla static static-libs"
 LIB_DEPEND="dev-libs/openssl[static-libs?]
 	media-libs/freetype:2[static-libs?]
 	media-libs/jbig2dec[static-libs?]
-	>=media-libs/openjpeg-1.5:0[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
 	virtual/jpeg[static-libs?]
 	X? ( x11-libs/libX11[static-libs?]
 		x11-libs/libXext[static-libs?] )"
@@ -40,6 +40,10 @@ src_prepare() {
 		"${FILESDIR}"/${P}-buildsystem.patch \
 		"${FILESDIR}"/${P}-openjpeg2.patch
 
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
+		-i debian/mupdf.pc || die
+
 	use vanilla || epatch \
 		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
 

dev-java/icedtea-bin/icedtea-bin-6.1.12.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-java/icedtea-bin/icedtea-bin-6.1.12.5.ebuild,v 1.1 2013/05/28 20:17:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.5.ebuild,v 1.3 2013/06/10 20:36:08 ago Exp $
 
 EAPI="4"
 
@@ -30,7 +30,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-lang/ats/Manifest

@@ -0,0 +1 @@
+DIST ats-lang-anairiats-0.2.9.tgz 2466767 SHA256 44bbf49f7bea0e411c5a24ae0ea3ecf1d771886b6bd19ea6798badb01f1512fd SHA512 fc7df7bc032ad665c9c8376245bb52f88f71ab81d36fa6f18e66886d9d19f247f54888a8ae3fa5adf17117ee6826bbbde1a177040dc2657f6da0f98d66b035e3 WHIRLPOOL 9d0f2906c87c98aca69ff0f76db19d42adc8bf5a97625b4f8c13bc751690c389e8b2f871206bad09a64ec2913b740cc38a65448c056a227ac561d832a1541e2e

dev-lang/ats/ats-0.2.9.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ats/ats-0.2.9.ebuild,v 1.1 2013/06/11 03:54:55 patrick Exp $
+
+EAPI=5
+
+DESCRIPTION="ATS Programming Language"
+HOMEPAGE="http://www.ats-lang.org"
+SRC_URI="http://downloads.sourceforge.net/project/ats-lang/ats-lang/anairiats-${PV}/${PN}-lang-anairiats-${PV}.tgz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib
+	x11-libs/gtk+:2
+	sys-libs/ncurses
+	dev-libs/gmp
+	dev-libs/libpcre
+	virtual/opengl
+	media-libs/libsdl
+	dev-libs/boehm-gc
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	"
+
+S="${WORKDIR}"/ats-lang-anairiats-${PV}
+
+src_compile() {
+	emake -j1
+}

dev-lang/ats/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+</pkgmetadata>

dev-libs/geoip/Manifest

@@ -1,5 +1,6 @@
 DIST GeoIP-1.4.8.tar.gz 1074829 SHA256 cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4 SHA512 aec70bdf002f1041ecb14f091e32206af033dc6ed89d20dffcc80e4c4edad993c9dfab7810576cb75f07d356ef34529ca3f2613e43e7f97c2b7ae099ce3be317 WHIRLPOOL 3dcaa7ef9610ede593b64a7a0f111adc0b2f9c4bf64054ef4f690d284a8c7ba45083d2739585047db18e3c22b50b026c9b5fee26142a4611af7b4092e907ffdf
 DIST GeoIP-1.5.0.tar.gz 1232688 SHA256 d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2 SHA512 87bc4972ae438f3f37a1f05e55377862a72437195e0241b7fa1ddf4ebaeb1da50a07a387ae13481dd1ff2a5ec39b9830a808618bb8c825417d25068684540b3f WHIRLPOOL 11ea882d6fd77426a2ffa05632dfc7ef9c16dc323bb01738ce9b0fa67a181d380e6c80f3a0f1065e12b95537e21ceeab817db2acf25492388fe6878bdf9ed6fa
+DIST GeoIP-1.5.1.tar.gz 1195457 SHA256 ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731 SHA512 aacb59ac7ced106ed420d320ffe6ffbec0d0e49ef3af8c2380c731824413386b6979e13f7a4ba81ba5b8d5ab4792830da232a02caa263752302acf55ac9bcae5 WHIRLPOOL 3a9761c30694b64d46727bc0da7620ab9db394a688017f48aa24be7d81b81e6d2fbb82e8b44bd350a58076c607fdfadca8e85695775904e05d774e3ea505dda0
 DIST GeoIPASNum.dat.gz 1848800 SHA256 4c4ea1243e7dcbef6067de7c4b7447be635d60c4b5a02174e878898fb54b8de1 SHA512 741541170506dc516af331e467906d0066c9b9a4fd8b50f17aa55a7d4a78134d37d3499bae09f8d95089d7003068f43dcecb11a985be2cde91fa630a459f1967 WHIRLPOOL 960da0748348ba6455acb59af5ab262279960b2c46c047b9dcdb2f6694accc8e140d41b06f75cdd82534d171512666b337ce4044b0a2f99d906e0dd0a3c115d8
 DIST GeoIPv6.dat.gz 932782 SHA256 3e83499214f44105c84989fe19fddba1208ed756443835064ffa69eafb5c74f8 SHA512 211d6035f2f7a5cc3f362395c9f66b21574ef6a2ee0d19da7e7dccc4484b75ff9d86dce5ced85824a0da3a29e8f39a51e32cc275d0735e9d2bde4a4bf0b1b5d1 WHIRLPOOL 2e7c17dc52c7f33b072b911e40b0a947b5e38bdbab342dd15f5470a143590d6be6df2da9a08243719bdb344e937db41a34a4ae20536e7a4c63459dc16ecefb8d
 DIST GeoLiteCity.dat.gz 12108586 SHA256 e322104ed00676102da1b5e66788a51bfd386447d2422b9cb770bbeb4e36954a SHA512 2503514df4908c1f0ed7a5d43b7f9d58fa25e2e6d6cd984e122a8bf3733f4b9372a4147a1c8678f70b83e518fd0b69a7e162643613a77ccd93d68af201a1497c WHIRLPOOL 12baea7c0a55122dfb72185896c71790f8d1e7b4023bab3594b02ee1ca9781a19bb8ee62b751d69ad6a55186caf6504845d9039598e35a877e200748476e04fa

dev-libs/geoip/geoip-1.5.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-libs/geoip/geoip-1.5.0-r1.ebuild,v 1.2 2013/05/22 18:22:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild,v 1.1 2013/06/10 18:53:51 jer Exp $
 
 EAPI=5
 inherit eutils
@@ -38,7 +38,7 @@ RDEPEND="
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+	epatch "${FILESDIR}"/${PN}-1.5.0-pkgconfig.patch
 	sed -e "s:usr local share GeoIP:usr share GeoIP:" \
 		-e "s:usr local etc:etc:" \
 		-i apps/geoipupdate-pureperl.pl || die

dev-libs/glib/Manifest

@@ -3,6 +3,6 @@ DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783
 DIST glib-2.32.4-AS_IF-patches.tar.xz 8584 SHA256 c61a87bbed8b09148f70f2651696430ab262d8ee905ebe2e0e963bb9038c5545 SHA512 cea825c379ea9014014f8a6f3a9fcf228e6b4245c649df4d86f6d86d1d655fd927ef1115fd66521cc48b2929d8cd504a284c7a8fb5ff38dc2b83ac4140655049 WHIRLPOOL e778094ad8ebe6fdc236942c21ee8ce2266712a08672b521f931159dd81d3452fcb8b6556c98c82b60548b1d9703a3ff332d02970a01565b6f5c4bcd02e74b46
 DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
 DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
-DIST glib-2.36.1.tar.xz 6524408 SHA256 7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24 SHA512 e738ef537fc8b05f535a42a46c3e5cf8d7c9c3aed788adea1bfd924e6031e6f3e8366850a3a1a0ea2c2a4c5e54f08eacf6cccbf32fb8a361b62a6caf9c4b7852 WHIRLPOOL 05298f71ff63b458ddc7e67c7ce0ab800109068c6bb2b0bff5ccfd76d8ed29cb5568d8a2953b71947bb0385033c3564467f9adfa377fc65c27eb765f71f71ef3
 DIST glib-2.36.2.tar.xz 6615452 SHA256 5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80 SHA512 0030b2d52570c5c72aeed85e1d8611d2354efdb6200be3a4f716bd0f92a34002546c974f65ee1fd8822ac791efce9574b6148b04a88af377108f60ad65220016 WHIRLPOOL 90e2335c37f951145d511e1532e5e2ad1590895f1cbe4c1dcc5ecdd45f5d68719d5cb8204e75afcd207e21fdb207be6f8453d20ef1a8279e93d234957b276219
+DIST glib-2.36.3.tar.xz 6626972 SHA256 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e SHA512 1ea45e7978bffb8ec23c8eddb74b0bab686126fd55d96956203bc1eef44e3047edcf2cbc39e018c83e56093f806c739bf320e6a359b45cd652e55c94a6f1ad19 WHIRLPOOL b6e997381fe451fe90f17478a6a3e3ddb75ca028a6f0adce1e970faef7dd64f2d88fa7a5557971bcba8e047a72801332f1804c815a9a45907dc0f468b888b404
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7

dev-libs/glib/glib-2.36.3.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-libs/glib/glib-2.36.1.ebuild,v 1.1 2013/04/23 19:02:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3.ebuild,v 1.2 2013/06/10 19:39:53 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{5,6,7} )
@@ -47,6 +47,8 @@ PDEPEND="x11-misc/shared-mime-info
 # shared-mime-info needed for gio/xdgmime, bug #409481
 # Earlier versions of gvfs do not work with glib
 
+DOCS="AUTHORS ChangeLog* NEWS* README"
+
 pkg_setup() {
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"
@@ -60,7 +62,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix gmodule issues on fbsd; bug #184301
+	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
 	if use test; then
@@ -132,7 +134,7 @@ src_prepare() {
 	eautoreconf
 
 	# FIXME: Really needed when running eautoreconf before? bug#????
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+	#[[ ${CHOST} == *-freebsd* ]] && elibtoolize
 
 	epunt_cxx
 }
@@ -155,7 +157,6 @@ src_configure() {
 	# Building with --disable-debug highly unrecommended.  It will build glib in
 	# an unusable form as it disables some commonly used API.  Please do not
 	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
 	use debug && myconf="--enable-debug"
 
 	# Always use internal libpcre, bug #254659
@@ -174,7 +175,7 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
+	default
 
 	if use utils ; then
 		python_replicate_script "${ED}"/usr/bin/gtester-report
@@ -189,8 +190,6 @@ src_install() {
 	# Don't install gdb python macros, bug 291328
 	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
 
-	dodoc AUTHORS ChangeLog* NEWS* README
-
 	# Completely useless with or without USE static-libs, people need to use
 	# pkg-config
 	prune_libtool_files --modules
@@ -234,12 +233,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	# For now disabled as looks to not break for a long time
+	#
 	# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
 	# TODO: add a subslotted virtual to trigger this automatically
-	if has_version dev-libs/dbus-glib; then
-		ewarn "If you experience a breakage after updating dev-libs/glib try"
-		ewarn "rebuilding dev-libs/dbus-glib"
-	fi
+#	if has_version dev-libs/dbus-glib; then
+#		ewarn "If you experience a breakage after updating dev-libs/glib try"
+#		ewarn "rebuilding dev-libs/dbus-glib"
+#	fi
 
 	if has_version '<x11-libs/gtk+-3.0.12:3'; then
 		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to

dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-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-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild,v 1.4 2013/06/09 16:00:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild,v 1.5 2013/06/10 19:14:11 zlogene Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ SRC_URI="http://dev.gentoo.org/~maksbotan/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads tools"
 
 REQUIRED_USE="test? ( static-libs abyss curl cxx ) tools? ( curl )"

dev-ml/async/Manifest

@@ -1,2 +1,3 @@
 DIST async-109.11.00.tar.gz 68860 SHA256 eb0bbcf46009401407316d259b58733b34baf63ce7ba6343dccbdcead565aa30 SHA512 7481e122a3caec720101ac5917934bdaa6fbe7d43cc2174d7824db7815f73538f4c1bf12c45f154ee7c4ab3e093e1a9898df6d7f6f9c43a47470e0d5823048eb WHIRLPOOL 3861ebbc97e7ed25883ca4e1b327fe468be44284439a8d9b2cba18dedbba779ed63b42c4bec0d9c48c911a7cd5d1d8b2607a219bb7a1cc565816886edfec3458
 DIST async-109.22.00.tar.gz 70671 SHA256 05bb73a1c39d5bfb5ba318ce4926b5d088ca9f5e562be4a116cfe038d733fe60 SHA512 1812600c72558c444b0772cc776f6c15ccb95a6042e69f0b6a39cf4b80162cff76301f0a2cdde11be3b7f4a2796a86c39d6ea1139aa20b4fd9402fd953e024ac WHIRLPOOL c6cec992a47374058f72b87e0c0ceff2d0371376d9d48afdba85b700e3c58ccc7a73421a97b9bf8cf62de7f9d078ff3cccfd7acfb5e918b4721aedc9f79e4e0b
+DIST async-109.27.00.tar.gz 70794 SHA256 deb6ec04c89e88150e7900c7868f40a1ad6260813748ff8be7cc2f10a4ce31f7 SHA512 cc83d87de78404f3f30cdb471452800e3529bdc6a0922307b8c31dfc45384dc6a8d822171edae14ddba64935f57978f46f7d1692d8bf986a831adbed34747496 WHIRLPOOL a258d44884c0a943eefb5fc30327f02b85abbeb8fc82fcba8ce0d7ad6e9132a796d2ae4c4b0970c78e4c93f07f9bcaf5af147025deafb1f38c8bb57c3ded0046

dev-ml/async/async-109.27.00.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/dev-ml/async/async-109.27.00.ebuild,v 1.1 2013/06/10 15:11:52 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Jane Street Capital's asynchronous execution library"
+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="examples"
+
+RDEPEND=">=dev-lang/ocaml-4.00.0:=
+	>=dev-ml/async_core-109.27.00:=
+	>=dev-ml/async_unix-109.27.00:=
+	>=dev-ml/async_extra-109.27.00:=
+	"
+DEPEND="${RDEPEND}
+	test? ( >=dev-ml/ounit-1.0.2 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	oasis_src_install
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}

dev-ml/async_core/Manifest

@@ -1,2 +1,3 @@
 DIST async_core-109.11.00.tar.gz 121267 SHA256 c4046b88bd61084543bb2a1f48f93b57c8c74e00a1e55639049547b9adb9bff4 SHA512 8702d75136d7d95aa4118bebcf89796e61e61c1e875ea14316cfaabfe53518fac37d9bfbdaf37e7d948e975d3eb8f641f06b3ad9532c54b6d95bd2c87d51880a WHIRLPOOL 4819e7390106af65a24503c6a1064bd1f4c082243818df3845692f3f695437c3bcbad5ad5b02cbded5660e68614ba0f903d59ee50453e52132b04de801cb1037
 DIST async_core-109.22.00.tar.gz 110497 SHA256 d0ee0f2805ee1a0f8910b15b32a4fdf9a39960ba91f1165f08d81a63fe7c28d1 SHA512 98472414c23ebcb4ef6cc679b2cfc6b2aa30385bdf4aab283654446b01df70996aa6ee1edb5a440128e3aedee758073fb19d6c1b487e592a14756260c978c38e WHIRLPOOL cd3dc9cb44c78ea941be9ee66bb8bfb004bee9f49e1dbe5262b866f4cf6a69dda092579b9b5973c752604d07e530b484418fc7da2c00aa22164bb5e48fa4fef2
+DIST async_core-109.27.00.tar.gz 110859 SHA256 9e4d1f7f0bb5fe6e0ac0c8901645877ea0daca8c46634f61bc4f5a6196875e05 SHA512 c6008225eb7f7d5c452036992cebcf0768b6919430c1dc9883f87a82a8031f70750e09bbd36ed0228180b2fb3864721d7616884209e22bd8cc5fb49821b26bdf WHIRLPOOL 8c3c05774ca5a0131378bc95510906045d6af43b13d37e63747d44776aa969f632926b4d6fc1958201435688b6c8c9042a16fbea9d7eef6c35f5b36b1477d31f

dev-ml/async_core/async_core-109.27.00.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/async_core/async_core-109.27.00.ebuild,v 1.1 2013/06/10 14:54:03 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Jane Street Capital's asynchronous execution library (core)"
+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/sexplib-109.20.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/core-109.27.00:=
+	>=dev-ml/zero-109.27.00:=
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"

dev-ml/async_extra/Manifest

@@ -1,2 +1,3 @@
 DIST async_extra-109.11.00.tar.gz 101774 SHA256 41d5c4ecafbd431d0cc7ca1119e4e43349c463af03a6ddd475b4d6949243f7c2 SHA512 f9ea08688befb1b3d63b0135234ce6970fe3af98a6147432c089bb380f8380cb8fbe93f44dae3e2dcf26125f32219a20bd0f276f7b503c45575d658f43117c0f WHIRLPOOL 93e1e5d20c7801272abb054f9f2120892ba96af9dfd03fbbb23f7e0b406809cd979119c0953cafcfaa5a299432ecbf543ddbcbd147600ad6a9d49322099dc852
 DIST async_extra-109.22.00.tar.gz 104376 SHA256 7feeb20118c1057e9dbe95513ebae9b4e61d227658c5e52e53bd77d94db1c786 SHA512 9782a2032ac8fc9803198061b0c78566fbf6f840a3f3268b78730fe5407320e9513241ed22d090fb20c1dbe277c58d9aa33386dd36537a7cc99061a4c9bbec43 WHIRLPOOL 43238595d2d064219f906a1132002831a03db6989929c708666194fec88f809be3889d41e3a8cf723a0d08e36ff36e48646c0b10870988be326a4b289db52e65
+DIST async_extra-109.27.00.tar.gz 106830 SHA256 8c262a8028e54f1406f9bb9daec4d69c5ddc24ecb277f5419d74dddf7100b9a5 SHA512 c1b64db8d182c0f77e204695d70ea48833cd2d26fe551abb1dfd89f9da2ddad26fe87d81229d49723158a4c907484894c8a49b3dd094a35a764ed1e61e077ae7 WHIRLPOOL 8a25cc3fb6548414808a280ab692a049964ce275583aef737b66bb735f36f4c8932461d53905aa2b49f97c1fc72a0e3fe555f20533d95a069e7eb57385374795

dev-ml/async_extra/async_extra-109.27.00.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/async_extra/async_extra-109.27.00.ebuild,v 1.1 2013/06/10 15:01:13 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Jane Street Capital's asynchronous execution library (extra)"
+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/sexplib-109.20.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/pa_ounit-109.18.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	>=dev-ml/core-109.27.00:=
+	>=dev-ml/async_core-109.27.00:=
+	>=dev-ml/async_unix-109.27.00:=
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"

dev-ml/async_unix/Manifest

@@ -1,2 +1,3 @@
 DIST async_unix-109.11.00.tar.gz 115500 SHA256 99dc94a2ef2bc082e4981aa6ee7ea210bdbacd042d390191facf727bf330c244 SHA512 e2f492e68ab9527d5a519bfa1a0ff1d394e24557866659abfb007b17bd0351ff3236f27a9ed783049eabd55193e397920ba6292efba468ada4b0ef7eccdfb200 WHIRLPOOL d790d7bb35101fee084d05d8db09b6e408e120b2e8f9f084f37d292a1cfc2a174d6d8db3dde395ff1ea40191181a4b6c671f1365a3de87475e482867bc09d6c7
 DIST async_unix-109.21.00.tar.gz 125603 SHA256 341341025ec76a3ec1478f26b1e8d57802e6de2f6462f9609db2c480bacdeaf6 SHA512 ee7b9d89cd49bfae05fc560699f0b2e1f176eccab0004b275048a0c1e474d3c234d5c193beda795c9fdff86686cc1dfd296776249a979ad172f3e1aa7666b50e WHIRLPOOL f522139f1dd59982b19f4c9dd250eb298c94b00981a51c676a48002d3151c19c1db221e08fafd45b08d07525714e20fc2026b42fdfdffaf7827183c4dc15fa8d
+DIST async_unix-109.27.00.tar.gz 127829 SHA256 8b54ad7989243dcfe847720ce27fe39e07c41f2687b5a9a619cc90c8bf8406bb SHA512 33c11a37ea62cfdb09a4b1423a69a6719a7f7eb458f2470f81203d58c7fb3f033ceb51432167e9e0c022d2973e8222a71cf8dd18158092f3a3688ee8420d216d WHIRLPOOL b1d25904b0e8131e9a8d78b760687281ba3d8043650c94645c9a15b8255ac5cd79cc1a8b4305cfc83ab7475af555471107f7db7c5575e496cbec7094ec4ea929

dev-ml/async_unix/async_unix-109.27.00.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/async_unix/async_unix-109.27.00.ebuild,v 1.1 2013/06/10 14:54:09 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Jane Street Capital's asynchronous execution library (unix)"
+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/bin-prot-109.15.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/herelib-109.15.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	>=dev-ml/core-109.27.00:=
+	>=dev-ml/async_core-109.27.00:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"

dev-ml/comparelib/Manifest

@@ -1,3 +1,4 @@
 DIST comparelib-109.08.00.tar.gz 54746 SHA256 2af57debc75b009d262e98e856123b830b490ae95b9439b993b24757d2fbe8c5 SHA512 2328d99830b43fdea9ab0415db84e58d504f9e248081b169b8f65ae1f1da054c34712d57ac7f3956180059ed51ac1fba6904ff86fcc92142ec7afb35b9ec42f9 WHIRLPOOL d0aa1307b073ba5b170ffd415085c262379a7b1d04a595e60098ff58a2ed62e182ccd52a3c19b0c0c61a079aba882abcb2fd4c526af5521d9d20c5c59c7ff9ab
 DIST comparelib-109.11.00.tar.gz 54353 SHA256 17c9486b29743a45b493b1ec730d95f3339fb56d9525688966daecb267b8c209 SHA512 2b8429d12115a3060de10f7927877e918055c1f2e592d2d0297e28a2f8d32a0c0a760a793394674699ba0da39c46ae2e3ec1c6f2ddd6719624d8ff532a383539 WHIRLPOOL 64abf612a7ba50ed9390015fdb03d986ac004018d76c2cf97126ef95acb0c86545e1626d3eef991ab415143b05d386b97bc7da75251460fe449701b70b625b0f
 DIST comparelib-109.15.00.tar.gz 53412 SHA256 1e63586208999d8d453d91ea50e1bb118e08ba6ce52dda1ee79a6e32efddd701 SHA512 a8de7cac6c16eb2a8e8adb559b62acd1c0d6a82abb32f45bb374f2f513aa8b05328d328e6ff17b5684c4f5d000296da7eefb965def7d410226381414d232e140 WHIRLPOOL 78d0b44c8a46c456d7b2c2bf240846cbdd331a6092071c7d24abbfe9e4bf4df6687286011510bcd662cd28f20047bfd0cdffc4dcc24a9cb7a5e4adfcea5f5435
+DIST comparelib-109.27.00.tar.gz 53593 SHA256 6d7015be475a08e3e4105f10697c0e3139c6a9b62c9c9dbf5039947c522a437f SHA512 b2f612febf94f596d8ba65fcb1b582f4505fac4bc0a3e0481f446bcbb72036410bd05628367a32b7ba4655cb052cff17cf1b8499f7e562566858216c7786a873 WHIRLPOOL 85281665252471d7c5e89a62ccec1c15c8aaa41778bcdeb81c6b4b2887cf749f9fef10b058c866a7b5b7bf6c9e8390cccdd43e52947a73d1c3a89bdf5b0c225a

dev-ml/comparelib/comparelib-109.27.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/comparelib/comparelib-109.27.00.ebuild,v 1.1 2013/06/10 12:55:42 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Camlp4 syntax extension that derives comparison functions from type representations"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+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-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-109.20.00:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" )

dev-ml/core/Manifest

@@ -1,3 +1,4 @@
 DIST core-109.08.00.tar.gz 786816 SHA256 cbfe0d92ce5828f261b556e52c391d74d48f02a0004c14618129891e705a3be7 SHA512 ffdfd6522d5ccef90f7057c498238378b6895a9b05478d6864b0db3311dbe34e7dbda32e74a05bb2615d5b35155717fc13a4c071a9aad1750464c202f7dd73e3 WHIRLPOOL 67bfbdcaa8f6b5009064375c059c3944c1bbdf61806f38e37adffba34c832ddaf5c2d3d322c51c44b9b7391625b425da46d7b38828ffacec9767c89eb2a45803
 DIST core-109.11.00.tar.gz 791099 SHA256 7e526ece56e15d14bae8039b2f537ed3a13fcc51d117e3d9f52cbd73d4ebee98 SHA512 807ef7c6c5ce6b8f6e599489b11abbb6558334b6da416d4afd79ecfa3fbebd50fb276d1a9f96d66039acf412be50892e49046968f2aaef29e05e712c06966e4e WHIRLPOOL 70792b8bfa101e3b7a18ff317842f48af850f37de92beebf384f873379d2538032643d1d4eb09fb096b3517ba83500402bf887deccb5df5ed94e48fa89161630
 DIST core-109.23.00.tar.gz 824763 SHA256 a611733511a178296c2c38a27fa112e024c96f27ca1255cc87257b437f863e15 SHA512 d7c6a56387a24d104094983fc6179181042e97a476ccfcf9aa65a0b052a56466503d3f27607f3278a4cc7199494ba1a17a81848c0332a824527abde0ec3277f2 WHIRLPOOL 0aedc284eec16159bb142f8a523e798d796b9251fc3853b313fa84ac339a288d7a07d983502156594813ace0be76b98047583643a29dcdde98570692f7c835b8
+DIST core-109.27.00.tar.gz 617211 SHA256 fcffa68754a2eb4de56e645d138aeb9a290c97fdcdff6cf79c8d0f729aa41426 SHA512 f6fb1555bf88f341a9a5e76b8e68bfeb63d3c280bb4d5d800999ff24399d826c53ae46ecabe4d87a5186f0e742ccc526a139b42994e51635b63e551d32514717 WHIRLPOOL 76ee86a61705a57c679ebb8c2c96e21b849dc0e4782e883ea683de5fbbe6be867777c352c421923da4393691c4848ef4f86ac04051789d0db612a7567ee94b49

dev-ml/core/core-109.27.00.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/core-109.27.00.ebuild,v 1.1 2013/06/10 14:35:42 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+MY_P=${P/_/\~}
+DESCRIPTION="Jane Street's alternative to the standard library"
+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="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/res:=
+	>=dev-ml/core_kernel-109.27.00:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/variantslib-109.15.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/herelib-109.15.00:=
+	>=dev-ml/pipebang-109.15.00:="
+DEPEND="${RDEPEND}
+	test? ( >=dev-ml/ounit-1.1.2 )"
+DOCS=( "README.md" )

dev-ml/core_extended/Manifest

@@ -1,3 +1,4 @@
 DIST core_extended-109.08.00.tar.gz 275052 SHA256 752ce06e5be433cdafc2c89d4448ea06b37610ad7392f2b23b2680953b76c532 SHA512 6d58f23fe60bfc3d55e274ceeb41146de58e46cbdf610aae50a4af25c68baf801d57d190a849246e14442062aa7d8524a2876ffac31761152bf5a1b10136f6fa WHIRLPOOL 602080940f7a51d254620e46db8f9e1a6e96a97b7bdcf41f10ef668697ba2559d05d5a7786c84734838bcc641860d7223ed4749b6d6a9b6b7b829c376341f00a
 DIST core_extended-109.11.00.tar.gz 283152 SHA256 cfe8eba3c3a4b2a6ad3d08bc5e0c357047d8a78e95102fe130ce5cc43fb2eadb SHA512 38b5017d0ea815842bc60170dadab81deb6ad0d97e7282f7b01be58f33a03d362c606f9765aa607c83a488a29ae6e23fc7e74c7e32348b96530c2757e0992133 WHIRLPOOL 73d7e1bfdab02a86e88e70f4ba07191703e96bbb70bf3540d077271c2808914c50e755033c8e81b62d81b0ac1bc8ffe2d772bc5aa11d1499924dffdc134849c5
 DIST core_extended-109.23.00.tar.gz 283186 SHA256 a5d4154a709808d4738d87d569c24f7f3b55e5f44aaa829d97335ace65333ad2 SHA512 c3cd58f3e380dcf0725421cd5e0e458cc250216e69ca59807cc0ee49d02ead9445bd41c8db2d91194db20df1a78693ac729bf456db93d098479ad1cbb6919898 WHIRLPOOL 534f3cae888394091378ebcd8f2d387cb93addbfc93fea01ac872a3b89cb62132197d281d7a7899cb69a1f8dca46f6531d854113b3911953d58f0a98f7c8e2af
+DIST core_extended-109.27.00.tar.gz 274802 SHA256 ec030feb2021a14b3221b61a89ba798b5e840d3982dd0aa82619640e5b6fd85a SHA512 3958676eae02eb6bc6ff1b20a77fc2cb37d9ca4255980bd74a09a92d3cca1a3278efe6d901b8f887eda9463251a4ae576cb702488bdc2d604ca7a067c4950d66 WHIRLPOOL 7ae86d0342d523f1b1a04457382fe6e80a9deb1d3ab8a08b7c1424d5939146cd6c9ed7138998622396852ae3323909bf1ff4c705b2f38026124f634248e99958

dev-ml/core_extended/core_extended-109.27.00.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core_extended/core_extended-109.27.00.ebuild,v 1.1 2013/06/10 14:36:02 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+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-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/pcre-ocaml:=
+	dev-ml/res:=
+	>=dev-ml/core-109.24.00:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/custom_printf-109.27.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	>=dev-ml/textutils-109.24.00:=
+	"
+DEPEND="${RDEPEND}
+	test? ( >=dev-ml/ounit-1.1.0 )"

dev-ml/core_kernel/Manifest

@@ -0,0 +1 @@
+DIST core_kernel-109.27.00.tar.gz 298528 SHA256 13207b74e45a629ab8dfd5dae7cc35b414d491604602e8420e707809c30fce9e SHA512 c6b863cceddde1bd3b4ec67b5f47c3edbdb7b6f4ea8625df263947c5b427afe43a49577a7822813500b428f1d9a4742644a6538bcb367b2b1bd2c5c9ef93bbb7 WHIRLPOOL 2992175efd5c062556652ea61fa19d8e53aa069362b0c2a8b04b27a379a384b6c9dd9fbd2531d989e6a47fdbbdcdc6a745715423d51dcd6e1ef51215ebf330f9

dev-ml/core_kernel/core_kernel-109.27.00.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core_kernel/core_kernel-109.27.00.ebuild,v 1.1 2013/06/10 13:23:17 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+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-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/herelib-109.15.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	dev-ml/res:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/variantslib-109.15.00:=
+	"
+DEPEND="${RDEPEND}"
+DOCS=( "README.md" )

dev-ml/core_kernel/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ml</herd>
+  <longdescription lang="en">
+	  Core_kernel is the system-independent part of Core.  It is aimed for
+	  cases when the full Core is not available, such as in Javascript.  It
+	  provides an overlay on the usual namespace, so the best way to use
+	  Core is to start your file with:
+
+	     open Core_kernel.Std
+  </longdescription>
+</pkgmetadata>

dev-ml/custom_printf/Manifest

@@ -1 +1,2 @@
 DIST custom_printf-109.15.00.tar.gz 47869 SHA256 e695ba51b989e9f036a8325bdc73fc01b0a8105bf9483c874e8e403facfd6cc0 SHA512 076419a8f9998301d614f6404398b868b6d799bd1d43f1b4ceffeb65e1575f4b2309d7f2d5ffa26e783710a9ea5479e566569c902059f4a5f2d7cf8d11e8e231 WHIRLPOOL b2acf833da6bae3b107883298380a45eb6162a8a60901a6f61e67a0f103f82ff15d3dd03fca78147e08d7541d9e38651a78e87a5921eb62ee221807c3f05c0ea
+DIST custom_printf-109.27.00.tar.gz 47893 SHA256 3589effb015fceaab943bf7074493232d33f0eed3b4ad5500f10b6014f2dcda5 SHA512 7a4cd650ee94b5c1ed1e68da54dcb5ddee56d7a8fb05a9fc660ed0bd616d88427e47fe4d7a98d95c9e58707376834b687f1ed0feecd1655228885bb1a3ccf7cd WHIRLPOOL 4819d845385a58f0210e896cc63fd1c3549cbfc15cf803120e996b1dff2739fffb5e9805d9183f1cc3ee306cdb098f014568bf8b1e781de20e41bb45cbb000cd

dev-ml/custom_printf/custom_printf-109.27.00.ebuild

@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/custom_printf/custom_printf-109.27.00.ebuild,v 1.1 2013/06/10 12:58:10 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Syntax extension for printf format strings"
+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-109.20.00:="
+RDEPEND="${DEPEND}"

dev-ml/findlib/findlib-1.3.3.ebuild

@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3.ebuild,v 1.6 2012/09/29 18:37:34 armin76 Exp $
-
-EAPI=2
-
-inherit multilib
-
-RESTRICT="installsources"
-
-DESCRIPTION="OCaml tool to find/use non-standard packages."
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?,tk?]"
-RDEPEND="${DEPEND}"
-
-ocamlfind_destdir="/usr/$(get_libdir)/ocaml"
-stublibs="${ocamlfind_destdir}/stublibs"
-
-src_configure() {
-	local myconf
-	use tk && myconf="-with-toolbox"
-	./configure -bindir /usr/bin -mandir /usr/share/man \
-		-sitelib ${ocamlfind_destdir} \
-		-config ${ocamlfind_destdir}/findlib/findlib.conf \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake all || die
-	if use ocamlopt; then
-		emake opt || die # optimized code
-	else
-		# If using bytecode we dont want to strip the binary as it would remove the
-		# bytecode and only leave ocamlrun...
-		export STRIP_MASK="*/bin/*"
-	fi
-}
-
-src_install() {
-	dodir `ocamlc -where`
-
-	emake prefix="${D}" install || die
-
-	dodir "${stublibs}"
-
-	cd "${S}/doc"
-	dodoc QUICKSTART README DOCINFO
-	use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
-	local ldconf="${ocaml_stdlib}/ld.conf"
-
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-	fi
-
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
-	fi
-}
-
-pkg_postinst() {
-	check_stublibs
-}

dev-ml/pa_ounit/Manifest

@@ -3,3 +3,4 @@ DIST pa_ounit-109.11.00.tar.gz 50871 SHA256 8e2b4bfac6e779c56feffcddbdfafd4c66a3
 DIST pa_ounit-109.14.00.tar.gz 49949 SHA256 eac0e200ae2c474eb6bdc6f81fdbe4a41fe423744f5f78ead12d09898423ab8c SHA512 cf604875be4e6b36519cd27a0e9dd09184368f1472fec7ff3de8450a5d36809f78eb744ca1f94ea40f89e53048154317253f1fb1a50221f5bfa1446580b39b30 WHIRLPOOL c5818067948a29e9a3e8ac6e0d86463b4cf32eebc5ea304459c9684c1479a5dfbe1938068bf1ed7cc2fbe24bd1f6ea8d236f620798b15d3b4b594081792181a8
 DIST pa_ounit-109.15.00.tar.gz 49944 SHA256 74089fc079102381fe8bb666764eddf33a4446226dd4ba22be822eed8b057767 SHA512 e19db82119763667cb85c8b9f76237d861bcd079a0409c8d2eadb6601ac286cf94364df44e364a4db2d3e251ecab047185c631732f918a42bc6d03583b6fc660 WHIRLPOOL a204268362c297841b9814a5d9a486879275e72e81623a6c4309caf3d48bbf0649789986c89dac169aa1159725e9956a781dc216ade22d61b80ea29f1374198a
 DIST pa_ounit-109.18.00.tar.gz 51492 SHA256 91108017b5520525859e9d1bc54a680d7904034e4e669861eec97434ef33ce65 SHA512 fe9968b41c6cedf95dca3bdaf58e12edeb66e71a54e91fc14d8fdd8fe5c4262e78aee392a75de77592de485fd7d0dc0f2b2d3f25cc96eb39416cbfd6eb65270b WHIRLPOOL cd0c9edad55760215eaa6f179b3b4bb6dc41d47d26df70ac8b2d5eda268ce6b58d18c9754f18da06cfd4e34719321ed88c5979d44c8d3b0850e636b4b38ca1bb
+DIST pa_ounit-109.27.00.tar.gz 51509 SHA256 b339ac8020b7618f5e99715752a10dc3f27704c6d11dca3aa3be584de0dd7d4c SHA512 0325460756cdbd3f0ec7a51f9b10c117e0ef1df50e6fff4d8b2c90dab919aeeeac4311d6945b6d375d10a4e6cc384905dad646e95f011737a26e64f865ffeb6f WHIRLPOOL 5956543be76fd073c12332242d0f44cf10e9f046f3c32015140bf8d176abba48f05cabab2254c5a232f4aedc0ab1a017886477b58f5eae1e3e954fe19b010d1c

dev-ml/pa_ounit/pa_ounit-109.27.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.27.00.ebuild,v 1.1 2013/06/10 12:32:46 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/textutils/Manifest

@@ -0,0 +1 @@
+DIST textutils-109.24.00.tar.gz 46390 SHA256 e9d55952ba214041ccc794d6942a7b166cfdeefa1517c23fea66c4c7c9db57c6 SHA512 56bb76bdac1e3769ba536adef4a16c87eab27d0f7cb842266e915703689e35eb9914f205cc67b18d35d30e054667d6a384bb12c995f585d39c33742fb96219d3 WHIRLPOOL c118f2f648afeb9fb2613cbdcf200c3c3b7acc3f9bcb0999e14917de4ec0adab33b83dd01de971b2ae707e1ce1a236c7de7644756606782b542e83a465302a34

dev-ml/textutils/metadata.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ml</herd>
+</pkgmetadata>

dev-ml/textutils/textutils-109.24.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/textutils/textutils-109.24.00.ebuild,v 1.1 2013/06/10 14:34:18 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Text output utilities"
+HOMEPAGE="https://ocaml.janestreet.com/"
+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=""
+
+RDEPEND="
+	>=dev-ml/core-109.24.00:=
+	>=dev-ml/pa_ounit-109.18.00:=
+	>=dev-ml/sexplib-109.20.00:=
+"
+DEPEND="${RDEPEND}"

dev-perl/Geo-IP/Geo-IP-1.410.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-perl/Geo-IP/Geo-IP-1.410.0.ebuild,v 1.2 2013/03/19 13:03:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Geo-IP/Geo-IP-1.410.0.ebuild,v 1.4 2013/06/10 12:08:56 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module multilib
 DESCRIPTION="Look up country by IP Address"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/geoip"

dev-perl/Geo-IP/Geo-IP-1.420.0.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Geo-IP/Geo-IP-1.420.0.ebuild,v 1.1 2013/06/10 19:38:56 jer Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=BORISZ
+MODULE_VERSION=1.42
+inherit perl-module multilib
+
+DESCRIPTION="Look up country by IP Address"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/geoip"
+RDEPEND="${DEPEND}"
+
+SRC_TEST=no
+myconf="LIBS=-L/usr/$(get_libdir)"

dev-perl/Geo-IP/Manifest

@@ -1,2 +1,3 @@
 DIST Geo-IP-1.40.tar.gz 111898 SHA256 ca48babd3e944cb1bc5cac56f618c9f94f3a329dd2716d6b49b658ae28848ab3 SHA512 6c5e3d136dcbaebf291ea14004cb775e0b4ef3ccaa4a200609a16818d34f6c9f1c2550b3f4d98626b6d58cfb372d1a7db86002506eddeceb592b800a056f11f2 WHIRLPOOL c4e91c22de1bc34b36c9d400c827577e878fa977098c7f0de68d35cae1b2354f4899b7e3663f9ec3c93f05b7fdf8015bbc9d55f285b30c30ef541b413ccf6889
 DIST Geo-IP-1.41.tar.gz 111749 SHA256 d6afe868033f2620377de3d311c277fa2e70ccf02266b72efe03358b87ded348 SHA512 ddf5eaee87cf8e60e9516495a8d34ad7776dedb70db7c3ccfe970c37e03806f18a94d99f0086ce8981f5a35488395e91ae6f45e1aa549d678506b261fab0c01c WHIRLPOOL b1999dcebad5ad0e9c2abaa71ae552d4a8d5eb0e4048e2dd08146544e76757798f00b0d85d8c384e2bc92202ef73166e6c6e6376cfa7c1a98ef28f4537d963ed
+DIST Geo-IP-1.42.tar.gz 111881 SHA256 c44b517490346e870cea22a1686937537088a85abf75eb8a01b136fc41cf81f5 SHA512 289d42a479fa5b7916bbb222a6c4f8be535c4bc1169413725b11a1291d49d795e59df963e432cbdf865a624e98e7448807a79c207cae84155607e4adceb585ab WHIRLPOOL 76303a43e633b669cce60004835ef09268699de833e4edea46affd96967041f346156baeb01a9d9f52a39b67749a5a24838b7bc8d7859a01c30becdb71f1bfe3

dev-perl/Lab-Measurement/Lab-Measurement-9999.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-perl/Lab-Measurement/Lab-Measurement-9999.ebuild,v 1.7 2013/03/27 23:08:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild,v 1.8 2013/06/10 17:59:08 dilfridge Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.labmeasurement.de/"
 LICENSE="|| ( Artistic GPL-2 )"
 
 SLOT="0"
-IUSE="debug"
+IUSE="debug +xpression"
 
 RDEPEND="
 	dev-perl/Clone
@@ -47,6 +47,9 @@ RDEPEND="
 		dev-lang/perl[ithreads]
 		dev-perl/wxperl
 	)
+	xpression? (
+		dev-perl/wxperl
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -54,8 +57,10 @@ DEPEND="
 "
 
 pkg_postinst() {
-	elog "You may want to install one or more backend driver modules. Supported are"
-	elog "    sci-libs/linuxgpib    Open-source GPIB hardware driver"
-	elog "    dev-perl/Lab-VISA     Bindings for the NI proprietary VISA driver"
-	elog "                          stack (dilfridge overlay)"
+	if ( ! has_version sci-libs/linuxgpib ) && ( ! has_version dev-perl/Lab-VISA ) ; then
+		elog "You may want to install one or more backend driver modules. Supported are"
+		elog "    sci-libs/linuxgpib    Open-source GPIB hardware driver"
+		elog "    dev-perl/Lab-VISA     Bindings for the NI proprietary VISA driver"
+		elog "                          stack (dilfridge overlay)"
+	fi
 }

dev-perl/Lab-Measurement/metadata.xml

@@ -6,6 +6,9 @@
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Huettel</name>
 	</maintainer>
+        <use>
+                <flag name="xpression">Install the Xpression measurement framework</flag>
+	</use>
 	<upstream>
 		<remote-id type="cpan">Lab-Measurement</remote-id>
 		<remote-id type="cpan-module">Lab::Bus</remote-id>

dev-python/colout/colout-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/dev-python/colout/colout-0.1.ebuild,v 1.1 2013/06/06 15:12:47 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colout/colout-0.1.ebuild,v 1.2 2013/06/10 17:53:22 maksbotan Exp $
 
 EAPI=5
 
@@ -14,23 +14,24 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
+IUSE=""
 
-RDEPEND="dev-python/pygments
-	dev-python/Babel"
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/Babel[$(python_gen_usedep 'python2*')]
+"
 
-src_test() {
-	testing() {
-		PYTHONPATH="." "$(PYTHON)" run-tests.py
-	}
-	python_execute_function testing
-}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_install() {
-	distutils-r1_src_install
+src_prepare() {
+	#PyPi tarball has wrong (old, evidently) README. Upstream uses GPL-3.
+	sed -e 's:BSD licensed:GPL-3 licensed:' -i README || die
+	distutils-r1_src_prepare
+}
 
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+pkg_postinst() {
+	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
+		ewarn "Though ${PN} supports Python 3, Babel does not, thus it's number parsing feature won't be used."
+		ewarn "If you need it, use Python 2."
 	fi
 }

dev-python/discogs-client/Manifest

@@ -0,0 +1 @@
+DIST discogs-client-1.1.1..tar.gz 4363 SHA256 e8ca09e65e277bf7886fa23070b8c63799bc7b57f749b9a15a0e104a63a19199 SHA512 1010771829ccebfbee774dda395ba7adc065cffc4b38e3252146989dee1ed81b693d74f9c455a515c5dc532e3840e5be3b9843bed62791f09bca608425b336ac WHIRLPOOL 4004b4630da22b1c0bb8b34afd8d44b1392d76449e402ff55c7c92230ae40fb74f3ded1eb876ec92ccfd99035b85ee009f1aa20784747a4a733b6eded6f229f8

dev-python/discogs-client/discogs-client-1.1.1.ebuild

@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/discogs-client/discogs-client-1.1.1.ebuild,v 1.1 2013/06/10 18:02:46 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Python API client for Discogs"
+HOMEPAGE="http://github.com/discogs/discogs_client http://pypi.python.org/pypi/discogs-client"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/discogs/${PN/-/_}/archive/v${PV}.tar.gz -> ${P}..tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}"/${P/-/_}
+
+python_test() {
+	"${PYTHON}" test_discogs_client.py || die "Tests failed under ${EPYTHON}"
+}

dev-python/discogs-client/metadata.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>int.teo@gmail.com</email>
+		<name>Theofilos Intzoglou</name>
+	</maintainer>
+</pkgmetadata>

dev-python/flask-restless/files/docbuild.patch

@@ -0,0 +1,57 @@
+A number of these settings are simply unworkable in gentoo
+diff -ur flask-restless-0.11.0.orig/docs/conf.py flask-restless-0.11.0/docs/conf.py
+--- docs/conf.py	2013-05-19 01:50:21.000000000 +0800
++++ docs/conf.py	2013-06-10 23:39:05.741199580 +0800
+@@ -99,7 +99,6 @@
+
+ # The name of the Pygments (syntax highlighting) style to use.
+ #pygments_style = 'sphinx'
+-pygments_style = 'flask_theme_support.FlaskyStyle'
+
+ # A list of ignored prefixes for module index sorting.
+ #modindex_common_prefix = []
+@@ -110,14 +110,11 @@
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+ #html_theme = 'default'
+-html_theme = 'flask'
++#html_theme = 'flask'
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
+ # documentation.
+-html_theme_options = {
+-    'index_logo':       'flask-restless.png'
+-}
+ 
+ # Add any paths that contain custom themes here, relative to this directory.
+ html_theme_path = ['_themes']
+@@ -253,25 +250,12 @@
+      [u'Jeffrey Finkelstein'], 1)
+ ]
+ 
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
+-                       'flask': ('http://flask.pocoo.org/docs', None),
+-                       'sqlalchemy': ('http://sqlalchemy.org/docs', None),
+-                       'flasksqlalchemy':
+-                           ('http://packages.python.org/Flask-SQLAlchemy',
+-                            None)}
+-
+ # fall back if theme is not there
+ try:
+-    __import__('flask_theme_support')
++    from flaskext import themes
++    themes.html_theme = 'flask'
+ except ImportError, e:
+-    print '-' * 74
+-    print 'Warning: Flask themes unavailable.  Building with default theme'
+-    print 'If you want the Flask themes, run this command and build again:'
+-    print
+-    print '  git submodule update --init'
+-    print '-' * 74
++    print 'flask theme unavailable'
+ 
+     pygments_style = 'tango'
+     html_theme = 'default'

dev-python/flask-restless/flask-restless-0.11.0-r1.ebuild

@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/flask-restless-0.11.0-r1.ebuild,v 1.2 2013/06/10 16:52:27 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Flask extension for easy ReSTful API generation"
+HOMEPAGE="http://packages.python.org/Flask-Restless/"
+SRC_URI="https://github.com/jfinkels/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( AGPL-3 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-2.0"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-httpdomain-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.11[${PYTHON_USEDEP}]
+		dev-python/flask-themes[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/docbuild.patch )
+
+python_compile_all() {
+	if use doc; then
+		if ! "${PYTHON}" -c "import flask_restless"; then
+			eerror "flask-restless is not installed. Building of the docs"
+			eerror "requires flask-restless to already be installed."
+			eerror "Firstly emerge without USE=doc, then re-emerge with USE=doc"
+			eerror ""
+			die
+		fi
+	fi
+		# Changes connect to read issues @ github
+		rm -f docs/changelog.rst
+		einfo "Generating html docs for ${PN}"
+		PYTHONPATH=${PYTHONPATH}"${S}"/docs emake -C docs html \
+			|| die "Generating html docs for ${PN} failed"
+}
+
+python_test() {
+	nosetests tests/test_*.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}

dev-python/flask-restless/flask-restless-0.11.0.ebuild

@@ -1,33 +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/flask-restless/flask-restless-0.11.0.ebuild,v 1.1 2013/05/24 06:01:21 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Flask extension for easy ReSTful API generation"
-HOMEPAGE="http://packages.python.org/Flask-Restless/"
-SRC_URI="https://github.com/jfinkels/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( AGPL-3 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Can't build docs for now, missing deps
-#IUSE="doc"
-IUSE=""
-
-RDEPEND=">=dev-python/flask-0.7
-	dev-python/flask-sqlalchemy
-	dev-python/sqlalchemy
-	dev-python/python-dateutil"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? ( dev-python/unittest2 )"
-
-PYTHON_MODNAME="flask_restless"

dev-python/flask-themes/files/fixtests.patch

@@ -0,0 +1,23 @@
+diff -ur Flask-Themes-0.1.3.orig/tests/test-themes.py Flask-Themes-0.1.3/tests/test-themes.py
+--- tests/test-themes.py	2011-07-14 06:36:33.000000000 +0800
++++ tests/test-themes.py	2013-06-10 18:20:25.901480529 +0800
+@@ -129,8 +129,8 @@
+         
+         with app.test_request_context('/'):
+             assert template_exists('hello.html')
+-            assert template_exists('_themes/cool/hello.html')
+-            assert not template_exists('_themes/plain/hello.html')
++            assert template_exists('cool/hello.html')
++            assert not template_exists('themes/plain/hello.html')
+     
+     def test_loader(self):
+         app = Flask(__name__)
+@@ -140,7 +140,7 @@
+         with app.test_request_context('/'):
+             if USING_BLUEPRINTS:
+                 src = themes_blueprint.jinja_loader.get_source(
+-                    app.jinja_env, '_themes/cool/hello.html'
++                    app.jinja_env, 'cool/hello.html'
+                 )
+             else:
+                 src = themes_mod.jinja_loader.get_source(

dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild

@@ -1,14 +1,11 @@
-# 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/dev-python/flask-themes/flask-themes-0.1.3.ebuild,v 1.1 2011/09/08 07:20:02 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild,v 1.1 2013/06/10 13:12:38 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="nosetests"
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN="Flask-Themes"
 MY_P="${MY_PN}-${PV}"
@@ -22,11 +19,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-python/flask-0.6
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
+RDEPEND=">=dev-python/flask-0.6[${PYTHON_USEDEP}]
+	virtual/python-json[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
-PYTHON_MODNAME="flaskext/themes.py"
+PATCHES=( "${FILESDIR}"/fixtests.patch )
+
+python_test() {
+	PYTHONPATH=.:tests nosetests || die "Tests failed under ${EPYTHON}"
+}

dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild

@@ -1,14 +1,11 @@
-# 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/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2.ebuild,v 1.3 2011/10/08 17:49:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild,v 1.1 2013/06/10 17:10:37 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="nosetests"
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN="Flask-XML-RPC"
 MY_P="${MY_PN}-${PV}"
@@ -22,10 +19,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/flask"
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
-PYTHON_MODNAME="flaskext/xmlrpc.py"
+python_test() {
+	nosetests || die
+}

dev-python/fonttools/fonttools-2.3-r1.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/fonttools-2.3-r1.ebuild,v 1.1 2013/06/10 17:30:41 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="http://fonttools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/numpy-1.0.2[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.txt Doc/{changes.txt,install.txt} )
+
+python_install_all() {
+	dohtml Doc/documentation.html || die "dohtml failed"
+	distutils-r1_python_install_all
+}

dev-python/pillow/pillow-2.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/dev-python/pillow/pillow-2.0.0.ebuild,v 1.2 2013/05/28 22:44:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.0.0-r1.ebuild,v 1.1 2013/06/10 19:51:02 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -105,7 +105,7 @@ python_install() {
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
 	use examples && local EXAMPLES=( Scripts/. )
 
 	distutils-r1_python_install_all
@@ -117,6 +117,6 @@ python_install_all() {
 
 	if use examples && use scanner; then
 		docinto examples/sane
-		doins Sane/demo_*.py
+		dodoc Sane/demo_*.py
 	fi
 }

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.4 2013/05/12 18:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.13.ebuild,v 1.5 2013/06/10 19:29:39 jer Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="

dev-python/pytz/pytz-2013b.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/pytz/pytz-2013b.ebuild,v 1.1 2013/05/03 12:33:23 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2013b.ebuild,v 1.2 2013/06/10 20:31:10 jer Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

dev-python/simplejson/simplejson-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-python/simplejson/simplejson-3.3.0.ebuild,v 1.2 2013/05/19 21:30:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.3.0.ebuild,v 1.3 2013/06/10 19:35:32 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} pypy{1_9,2_0} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm hppa ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 python_compile() {
 	if [[ ${EPYTHON} == python2* ]]; then

dev-python/sphinxcontrib-httpdomain/Manifest

@@ -0,0 +1 @@
+DIST sphinxcontrib-httpdomain-1.1.8.tar.gz 8844 SHA256 29ff90b9e51a8e0cee4372c8f39d85edd0a88747dd0ae5e7734a66f63e256279 SHA512 fa6abe4c6b42844dd0b066c591e8780e01ed006304b31af0ffe6bc89a08c31cca71510d3013b45014409784fce6b0f869d117a34759856b54356d5a4ca7398d1 WHIRLPOOL 95a17f70df2bc51c07432e1966135464b530ca1f9e532bdbf4a07e05fe67eb9a1150d1a13ed4c6e2e2faaefa91fd4915adf701811ad83766cc0b80a6a5b0002f

dev-python/sphinxcontrib-httpdomain/metadata.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<herd>kde</herd>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
+	</upstream>
+</pkgmetadata>

dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.8.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/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.8.ebuild,v 1.1 2013/06/10 09:07:30 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension providing a Sphinx domain for describing RESTful HTTP APIs"
+HOMEPAGE="http://bitbucket.org/birkenfeld/sphinx-contrib/ \
+	http://packages.python.org/sphinxcontrib-httpdomain/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"