Do not use /usr/bin/tlib or /usr/bin/lib until bug #469150 is resolved, /usr/bin/ar is used instead. This is a temporary fix for bug #468540. Upgraded to EAPI 5, distutils-r1 and indirect python-single-r1.

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

8 files changed, 144 insertions, 130 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 0d0022d78606..c995affa6bdf 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/antlr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.95 2013/02/05 06:56:19 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.96 2013/05/09 11:45:47 tomwij Exp $
+
+  09 May 2013; Tom Wijsman <TomWij@gentoo.org> antlr-2.7.7-r1.ebuild,
+  antlr-2.7.7-r2.ebuild, antlr-2.7.7-r3.ebuild, antlr-2.7.7-r4.ebuild,
+  antlr-2.7.7-r5.ebuild, antlr-2.7.7.ebuild:
+  Do not use /usr/bin/tlib or /usr/bin/lib until bug #469150 is resolved,
+  /usr/bin/ar is used instead. This is a temporary fix for bug #468540. Upgraded
+  to EAPI 5, distutils-r1 and indirect python-single-r1.
 
   05 Feb 2013; Rick Farina <zerochaos@gentoo.org> antlr-3.1.3-r2.ebuild:
   adding ~arm
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 5d119baadf70..750873bbfbac 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 2.7.7-gcc-4.3.patch 383 SHA256 de68d3a12a03d7bcdbd3e1cf5ab7d773123a55b4d9e8bb9f3a873fa2c2be84e2 SHA512 904ba9c0e4ca4980b415c1095b774d1f1eade009080372ae86b6090db9bc55998bed2536b08fe84e70e11a05f503636b1acda06064814ccb67b04aaf673d6910 WHIRLPOOL c69791355368a62938504f5b6356c59b36e3eee96aae0c4b879f27dc8bf86bda8799b77b0b57fe163e4e32914ae4e51464fcf9cd8a0bf1eb1fb80eaeb7eed339
 AUX 2.7.7-gcc-4.4.patch 257 SHA256 4d1c713424893be36f5b29f73a9e7f491274abe6535af31c26bf0aa8dbf00256 SHA512 d93af8f5c8dc415bab85f320bd39fcbbcae0e30c17dfa87b531599610b251c3472b72a84d5aa540d74342762d9a6ac510dfbf6001464d997b3753cac6ed85542 WHIRLPOOL f66210f8e129b9694340c996e41fa515c0b56981b9cf4393a5d091a98ba989f5278f2141b9bdf6da2258d3cc9f6e143c0fac3e76bb6315c35f6a75ab83ed3f57
@@ -9,29 +9,23 @@ AUX antlr.pc.in 155 SHA256 31bf717831c33e3088958712f2c6629427a505ee0a48030e65b4f
 DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
 DIST antlr-3.1.3-generated.tar.bz2 47167 SHA256 ed326de0f1f92dd72e8d9644e8eaf59d02b9725b4b5218f5c54e12100f8d05f4 SHA512 4ea01ad0d5fc99607ffa445fb99ae424648b713dca293d05ff4ec064cac0a0fe5073df3834f9b6990e99f3cefc5cdd191a1ee3c3951d97615908b94630070bba WHIRLPOOL 61f7829811251a35528c322952830dc5a6e82e23e36f664af179b41955734e771aaad070298666a15be0f41982dbb8b19955b5967987582c6b666e602384d060
 DIST antlr-3.1.3.tar.gz 10743515 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cfb6407084e6909f8220bc1039 SHA512 6814b970740bd61e6727f81b1a2fb4249f8f029e756694d852224eee54e0231540f8e23d2fa8f78eef234d6497f5fa1411e76020ffaed737d8c1a5178321a062 WHIRLPOOL 9d9a1caf39595dbb9b300f730091cfa38a12ab10b8a59d58c7bdd9ba4674bce9f49bc21b5b170129216ff9d880dbf5f0bdb5bfe614b003a4ffe948948b5413c9
-EBUILD antlr-2.7.7-r1.ebuild 2953 SHA256 c0b32c683f23487c723168b24ca932b0d16474466995c8acdb1f06e921cdc12f SHA512 d35b2dbca529f5ec1aee3718ea03c537c4056f08bd90f7526aea9f322dc30d1072b3f7bf61f3cad897b75bdd91cb2b6ac4661938df9858000bae53bd8f7e3ce0 WHIRLPOOL a34b9411e09303ce379abe417e92b4bfad52a7a944afeb9d1f8922a42a50eff2226d2c5a38f46c57d1030568c0d4fd962eb6c04bd78eab2a786cb7848b54f16f
-EBUILD antlr-2.7.7-r2.ebuild 3729 SHA256 b0a6f5b5d5abc7b878aec228b437aee5f94e59f0398b84986c89375b2d03907b SHA512 e461d99a8f7ac03550e410cdda2a134ab60f60fdffbc07003e41ae58638292e6ce51f96f589bba25edf54197ad6760c7e0e4787f0876d4b3123b39944089cf9a WHIRLPOOL 07adaf4765f430a74196232534b1c26ff27f97d1ff31df9a69bc326fdad25c8685512dffd2f0ab7e9421728f246253de332f0765b71c825f730ad28b88a8851a
-EBUILD antlr-2.7.7-r3.ebuild 4391 SHA256 25ada0a5688db68e8636f9d7319e34043f9834bc435de5b35c56a9bd3981235f SHA512 2a71f5f95b0e1a3b104a65b32421382b6361a3850660811e8ac1c94497582f60e5a63ae67e572fd973713dedd8042d13c9f904c5897b40d2c9cb88ee3a60becb WHIRLPOOL ee4688786c608ec574af2b5cd62e9f1e4dd4bd3663df23fe723e9a5c22b9dfb3e96bfa800bd32c182d6ed8ccf196982a268961f506eac8a20e7f1c599b6afc35
-EBUILD antlr-2.7.7-r4.ebuild 4476 SHA256 03465c5f2a5fb79d20d27dff48ac864f51a0eb0a84f8b6b3b9f656e519ea0d27 SHA512 198e3551db7de61328f51dd03170316e5904e5951ce60747d66dcdbff4a703c90f873c25bf065eeb1b77382d95de1630b4922c7b77aafa3f5dbed3bf09093ffe WHIRLPOOL 4758b4490d275e150a7de0296fbf42d3f5f31039c6bf8d4a1f6791cd59c8d8f2edcc8163e635129c7f5b27344f1744cc2e653d34e562c77edbc50d5dbe5256e4
-EBUILD antlr-2.7.7-r5.ebuild 4371 SHA256 f5ae76b2547ca82ccf445bc177cecce191fe4f148af2e8757634e76d67562640 SHA512 e97ed3cadda0bbb1b202db91b221421868cc4f461e8b50f6328ad1acbd3a65682569dd6eb953a64de578af4c7b3e57018bb2c9931623e84059111323202de8cc WHIRLPOOL c58cb71de1a7ba231adafe9d27d4e91292eeaacfce61d9d0e41c88e28ba283a23bdfd9690c6cdf04dae77a432fc96bce0e6c356d72ce66d4281278c76bb34bc1
-EBUILD antlr-2.7.7.ebuild 2940 SHA256 fea968fc241b109365bbcbb1c3bda122fb8ca0d50b01b8cfb77a7758531b8610 SHA512 3da7242e7f1e67ca190df573ac26cae3aad0361b7b0f76153160ab0a99e5ca33af113a624a627fd2baae9f6abae18119610cb326b1b9703ce1c547af8a72496b WHIRLPOOL 40b54718b2d3d1985e4156eabf87a35c3d6afcb4b808c8a82b0166173f10b7400b2ec997418d2b72f96e4bff5536f9e3cadd61ebb41a58cd94786c3d6bd261c5
+EBUILD antlr-2.7.7-r1.ebuild 3118 SHA256 6c16808bcb59b6ddee64dcf5cedee5b3d951c6caa40ed1884fdc771dd251d0a9 SHA512 0e4fdec44a847f80c73f0afba0f2f955d3a92f6e14ca3b3500cbdab0dbf54a55ec5dbdda46ec5439ba20121c8d8e6726f737ca228bbb23286daa7f2d6c6dcbfe WHIRLPOOL 4c86e9cb7722ba6824eedc24d700fc2935ba648395bba678f6077c269f8671715f9651b92540563397d53431b1824e71f1786f292f4dce4e62f7aba199b2d15b
+EBUILD antlr-2.7.7-r2.ebuild 3895 SHA256 e4fab90cfa3f943db17b75cd7ab010480977cbc022f6ea70f34b2fad61b50242 SHA512 c9130dc454adc3c0eb779f8046c6078cd6a21a29f42d87f7cf8a06187dbbf26193a06de3778d11fe62bf8f6d27282f10439b1a1c7f4eac14b20968ecfb47a00d WHIRLPOOL bbd16d2d66f5dbcfccc43b4b4be2303261c9dfd17c7bacdc4f34b625ffbb560a3e3325bd0a8e004034cdfaade717f6790be53f0f936a3885d68298c766ad65b3
+EBUILD antlr-2.7.7-r3.ebuild 4556 SHA256 35f735633d8babd3395d4a955be7956b2a535e83c4f76aafc77f683386d26f0d SHA512 6d8a42550a308736b4895b3de2b16765c6963ae88c33ff6bf9442a81c748f10bb02a02407ea32c9c9258c0115e828cf6bd0f247fc98d6f93a4d8341dad415510 WHIRLPOOL 4d23e09d26b6f4d963e9b63317b5ac505d2cb83ae6fc47c8d4a4bbd1cf15276a5eefed615ab01331fc4d02356489da4f83d3f43addc3bcf7c6458d0fd1f60281
+EBUILD antlr-2.7.7-r4.ebuild 4641 SHA256 8186878866c5fc913a6f6b6967251c78549e329ccf701ab43371cf67a1a6354c SHA512 5bc2ea0f15c2d58be1b88b9b1b7fa85b36e2710606ed42fb751a25329ba6d5bc98d3420ae74c39f8b8d2bbd6b78cb151e47a0cde3520ab30ed681c55de249984 WHIRLPOOL 8d981c8b4d61443375f63f59820a9269695b44f3a8754c370e87f1798123eef8e503f36e07fec4f04e66fa9ae2e694bcfb8a060989ffb168aaccfb3ca14077bd
+EBUILD antlr-2.7.7-r5.ebuild 4512 SHA256 361870dc5b11269e1b9c026afd461e8e5ac9237f494e7a008c4d34c17811bd25 SHA512 6ac9d4f01eebb8e14c84545ee0ef67daf008511da021804f474f1f7609c91b3c66f625adb697237b4e6f0142b762e16fd5a8951e87f087166da064a27b7f9caf WHIRLPOOL 413d76470fac7578631d51e43d38d30602008ada905de58e7cc28d558fe365a7fcaa28f5569a6360a63e9b1e3f4c9ce272b06b64a634f667f4124024d6dadc71
+EBUILD antlr-2.7.7.ebuild 3105 SHA256 39fbb34a1441011e83db15ffffc84c91dab85088bb5e85872f03a62961304560 SHA512 796eb42bd85009df3b9519ce1a23ec0d986af2f61f1b66089a7cdeadf6969dea2aec12ea4c473a72df4f0b870acc65490c61ae3e76fe4d2a297fa78de5e45423 WHIRLPOOL 69b9f49328da3ee0935d20bd2a17f0694b5964e2c2f8a6ea45f89248add1c8f0d0b5ff9b5d248df47938da430fc49eed62480338fb681add057b07d86b86788c
 EBUILD antlr-3.1.3-r2.ebuild 3495 SHA256 01e16e6a9327a51e1dac426d3bfd62a605c1ca2aedd806b3c19a08b570ead175 SHA512 4d0a42b83de6e9d15ff2f104c7d6e6a4a47a43d1a0091c00adce4d3ca0f4dcb21149a8232e9873186301978ed50eab81e2bd0895d49773ce4936a53d70403a28 WHIRLPOOL 5f2665de359691a3b1e5ce64ebad1c98e159d5e08a50b363570f544a1412fbdcfa0d2dae3c8d4c31636b95dbc01aa9776aaae72be88208eb92b4930cc310c4ff
-MISC ChangeLog 13143 SHA256 76da8fdb4c518b95e45b5fb4d7753697a05ecbb5a983703933120683e57ed294 SHA512 4b372d07fe6e2ced7f541f96b16bc265c87d1415b23b88748917f637da13c12878ae3cbb1b69a27a5dce643c069202ea235c8b4ca0b531da60fe8587ca7be387 WHIRLPOOL d77076f8c83990b7a51923ccda31b39166e6f8f7bf7003c39598f83b84ccb26a4361abdf5939992c0a65bc32802e553fd6eca15b07cfe92ca4bd89310e0c7fae
+MISC ChangeLog 13539 SHA256 215f0d95d72882d44788950b7b19d8dda9cc2f131575051833ce8a358ec9d956 SHA512 adec83f972c040c53d9a3c8e1f93e1700cc242426364e4bb9c023834cfdf1c2536fcde2cd14dd5e843eddd8ffeb4160d9a72682d7616792fe2755d2e16e02569 WHIRLPOOL 4bfe80bb0f01fd823d1f892b590bb9c7fc9138ae913a8cfea02ee4a4e8bb87c16ce00711ca2690fa756f33711081957d069de8289e631c275491e3ad7934d25b
 MISC metadata.xml 363 SHA256 6aa7ec680dc08ab936d6f59f1444bba56902fec42eaf16d5c9919350a5c355cc SHA512 0a05d4764adaad5893a1c0857f5974d71628ef26d487b558042e38ebbe4184bda173e224941ad5821f10c7d52eb2ddd2e1db325474ef6e67e971e249ec39e979 WHIRLPOOL f22fb4f75860a5696b8823b0bb3a41fbaba0e78de9d2ca91704a82577072d4e3b1018705ef2af789d5dfd2a9704f003101af7a699ec71732afd3ec850533fbf1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJREK0UAAoJEKXdFCfdEflKXRoP/RVLaXK8nLqxrwuafcGtF36S
-C7+ForoqRNJpVqc9rD/nvGfuovOkhXYCDCIUvQRPTfk4Qn/Weh6R6ip9xT5TO1Un
-G59MLEpqCEVSLBY98OMXkwPMjoW63cEkfVDjuj+aYnj+uvXAUeOMtwSkQoXuBdIM
-P0sSoPCU3MdyO94veZIzJXRFGf0hJKs2iUfqodVs7Vt49FQ2he4ECnbvKzsv1lCs
-vvwOFKWLXmmVqKds06iSIQV1oA1FQvwfOunoSkLFUQ1c2F15wymVIorDuY8uI6mp
-hLd7exQDwhHxxrPBOwhbVrC33TpaoERT7JkoYRnyouzuDPABrqyCRYpsEkPByaID
-wxL/NpzjRjxmVQX8AppS/i6e0teNodbahMeMKtYxZM6BNWdf8JTBfVQm3xvCSxcm
-IqXt9A+pcDQyJp4RsXtXP0jhKYSf48NEIpml3vVkbwIwzpjTDyqi+zuFANdDdrHS
-sJuH3NoqmXploxfzXE6uTc9ARawtp9s1Es0WHJMlKkW+4l35l4cKlSBMTjX5Rv4/
-i722C2eOWssg9MLq4xTIaZKSRzhcofHN39/ArVjkWUnAysCpGT6k4PXEnmTZv2lZ
-qSSSHc92/ao/jnweHoDC3DzOUZ3uFAykqqk0cLEfeyBfXKQu6OSmXbF1UXrdzjDV
-b1I0q9LvjtRPIKdaiq5s
-=XaHx
+iQEcBAEBCAAGBQJRi4wUAAoJEJWyH81tNOV9sAcH/3wHxc45Umy6x7Gs+3LGv8Xm
+2jO5BYbQwlkC7gVKvfR+NGO+alLNUvTXnrReKON0hLnx04GJ2eXmYkfb/PX+9K5i
+eIH/zsiBFrrQy0qPlc54vvJuqiXv+w/ajze6UpIbgfGEWUnzeOQl6iiK4aLchblG
+6sgPdc1gqxdZtnWeGe0yIWqZQKPhbPZA8ydXbJX6y0NJbk10SX+lrmmOxxLxKBk3
+0F90TxnicCsxc/w/r4Q6S+ePFGuRxodwNYdRV6TvRPID0IgPU0kckP7pP7SJOhqy
+c6+HxyuoWjKUufBHfAE8TUMJMl10rRIJmLb4mtIE8Erq4bCI7MQYPkU1Ri7Q4yc=
+=I4rS
 -----END PGP SIGNATURE-----
diff --git a/dev-java/antlr/antlr-2.7.7-r1.ebuild b/dev-java/antlr/antlr-2.7.7-r1.ebuild
index 271d765e554a..a1039e6e6951 100644
--- a/dev-java/antlr/antlr-2.7.7-r1.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r1.ebuild
@@ -1,11 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r1.ebuild,v 1.3 2013/02/05 06:54:43 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r1.ebuild,v 1.4 2013/05/09 11:45:47 tomwij Exp $
 
-EAPI="3"
-PYTHON_DEPEND="python? 2"
+EAPI="5"
 
-inherit base java-pkg-2 mono distutils multilib
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+DISTUTILS_OPTIONAL="y"
+DISTUTILS_SINGLE_IMPL="y"
+DISTUTILS_IN_SOURCE_BUILD="y"
+
+inherit base java-pkg-2 mono autotools distutils-r1 multilib
 
 DESCRIPTION="A parser generator for C++, C#, Java, and Python"
 HOMEPAGE="http://www.antlr2.org/"
@@ -17,7 +22,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc debug examples mono +cxx +java python script source"
 
 # TODO do we actually need jdk at runtime?
-RDEPEND=">=virtual/jdk-1.3
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=virtual/jdk-1.3
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
@@ -28,14 +34,17 @@ PATCHES=( "${FILESDIR}/2.7.7-gcc-4.3.patch" "${FILESDIR}/2.7.7-gcc-4.4.patch" "$
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
+	if use python ; then
+		python-single-r1_pkg_setup
 	fi
 }
 
 src_prepare() {
 	base_src_prepare
+
+	# See bug #468540, this can be removed once bug #469150 is fixed.
+	sed -i 's/tlib lib ar/ar/' configure.in || die
+	eautoreconf
 }
 
 src_configure() {
@@ -96,8 +105,9 @@ src_install() {
 	fi
 
 	if use python ; then
-		cd "${S}"/lib/python
-		distutils_src_install
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_python_install
+		popd > /dev/null
 	fi
 
 	if use examples ; then
@@ -114,11 +124,3 @@ src_install() {
 
 	newdoc "${S}"/README.txt README || die
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r2.ebuild b/dev-java/antlr/antlr-2.7.7-r2.ebuild
index a61b51612b50..eebb53a435a0 100644
--- a/dev-java/antlr/antlr-2.7.7-r2.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r2.ebuild
@@ -1,11 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild,v 1.6 2013/02/05 06:54:43 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild,v 1.7 2013/05/09 11:45:47 tomwij Exp $
 
-EAPI="3"
-PYTHON_DEPEND="python? 2"
+EAPI="5"
 
-inherit base java-pkg-2 mono distutils multilib toolchain-funcs versionator
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+DISTUTILS_OPTIONAL="y"
+DISTUTILS_SINGLE_IMPL="y"
+DISTUTILS_IN_SOURCE_BUILD="y"
+
+inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
 
 DESCRIPTION="A parser generator for C++, C#, Java, and Python"
 HOMEPAGE="http://www.antlr2.org/"
@@ -17,7 +22,8 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc debug examples mono +cxx +java python script source static-libs"
 
 # TODO do we actually need jdk at runtime?
-RDEPEND=">=virtual/jdk-1.3
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=virtual/jdk-1.3
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
@@ -37,17 +43,21 @@ make_shared_lib() {
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
+	if use python ; then
+		python-single-r1_pkg_setup
 	fi
 }
 
 src_prepare() {
 	base_src_prepare
+
 	sed -i \
 		-e 's/install:.*this-install/install:/' \
 		lib/cpp/src/Makefile.in || die
+
+	# See bug #468540, this can be removed once bug #469150 is fixed.
+	sed -i 's/tlib lib ar/ar/' configure.in || die
+	eautoreconf
 }
 
 src_configure() {
@@ -119,8 +129,9 @@ src_install() {
 	fi
 
 	if use python ; then
-		cd "${S}"/lib/python
-		distutils_src_install
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_python_install
+		popd > /dev/null
 	fi
 
 	if use examples ; then
@@ -137,11 +148,3 @@ src_install() {
 
 	newdoc "${S}"/README.txt README || die
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r3.ebuild b/dev-java/antlr/antlr-2.7.7-r3.ebuild
index 7e283f66b7a9..b5c63fa4f8e3 100644
--- a/dev-java/antlr/antlr-2.7.7-r3.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r3.ebuild
@@ -1,11 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r3.ebuild,v 1.3 2013/02/05 06:54:43 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r3.ebuild,v 1.4 2013/05/09 11:45:47 tomwij Exp $
 
-EAPI="3"
-PYTHON_DEPEND="python? 2"
+EAPI="5"
 
-inherit base java-pkg-2 mono distutils multilib toolchain-funcs versionator
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+DISTUTILS_OPTIONAL="y"
+DISTUTILS_SINGLE_IMPL="y"
+DISTUTILS_IN_SOURCE_BUILD="y"
+
+inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
 
 DESCRIPTION="A parser generator for C++, C#, Java, and Python"
 HOMEPAGE="http://www.antlr2.org/"
@@ -17,7 +22,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-
 IUSE="doc debug examples mono +cxx +java python script source static-libs"
 
 # TODO do we actually need jdk at runtime?
-RDEPEND=">=virtual/jdk-1.3
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=virtual/jdk-1.3
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
@@ -52,9 +58,8 @@ make_shared_lib_macho() {
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
+	if use python ; then
+		python-single-r1_pkg_setup
 	fi
 }
 
@@ -63,6 +68,10 @@ src_prepare() {
 	sed -i \
 		-e 's/install:.*this-install/install:/' \
 		lib/cpp/src/Makefile.in || die
+
+	# See bug #468540, this can be removed once bug #469150 is fixed.
+	sed -i 's/tlib lib ar/ar/' configure.in || die
+	eautoreconf
 }
 
 src_configure() {
@@ -135,8 +144,9 @@ src_install() {
 	fi
 
 	if use python ; then
-		cd "${S}"/lib/python
-		distutils_src_install
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_python_install
+		popd > /dev/null
 	fi
 
 	if use examples ; then
@@ -153,11 +163,3 @@ src_install() {
 
 	newdoc "${S}"/README.txt README || die
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r4.ebuild b/dev-java/antlr/antlr-2.7.7-r4.ebuild
index 81329fd9785e..d560faf6ff10 100644
--- a/dev-java/antlr/antlr-2.7.7-r4.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r4.ebuild
@@ -1,11 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r4.ebuild,v 1.2 2013/02/05 06:54:43 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r4.ebuild,v 1.3 2013/05/09 11:45:47 tomwij Exp $
 
-EAPI="3"
-PYTHON_DEPEND="python? 2"
+EAPI="5"
 
-inherit base java-pkg-2 mono distutils multilib toolchain-funcs versionator
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+DISTUTILS_OPTIONAL="y"
+DISTUTILS_SINGLE_IMPL="y"
+DISTUTILS_IN_SOURCE_BUILD="y"
+
+inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
 
 DESCRIPTION="A parser generator for C++, C#, Java, and Python"
 HOMEPAGE="http://www.antlr2.org/"
@@ -17,7 +22,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-
 IUSE="doc debug examples mono +cxx +java python script source static-libs"
 
 # TODO do we actually need jdk at runtime?
-RDEPEND=">=virtual/jdk-1.3
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=virtual/jdk-1.3
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
@@ -52,9 +58,8 @@ make_shared_lib_macho() {
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
+	if use python ; then
+		python-single-r1_pkg_setup
 	fi
 }
 
@@ -67,6 +72,10 @@ src_prepare() {
 	if ! use static-libs ; then
 		epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
 	fi
+
+	# See bug #468540, this can be removed once bug #469150 is fixed.
+	sed -i 's/tlib lib ar/ar/' configure.in || die
+	eautoreconf
 }
 
 src_configure() {
@@ -139,8 +148,9 @@ src_install() {
 	fi
 
 	if use python ; then
-		cd "${S}"/lib/python
-		distutils_src_install
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_python_install
+		popd > /dev/null
 	fi
 
 	if use examples ; then
@@ -157,11 +167,3 @@ src_install() {
 
 	newdoc "${S}"/README.txt README || die
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
index 23ee62b9ec47..7628e6d2b7f4 100644
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r5.ebuild
@@ -1,11 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.4 2013/02/05 06:54:43 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.5 2013/05/09 11:45:47 tomwij Exp $
 
-EAPI=4
-PYTHON_DEPEND="python? 2"
+EAPI="5"
 
-inherit base java-pkg-2 mono distutils multilib toolchain-funcs versionator
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+DISTUTILS_OPTIONAL="y"
+DISTUTILS_SINGLE_IMPL="y"
+DISTUTILS_IN_SOURCE_BUILD="y"
+
+inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
 
 DESCRIPTION="A parser generator for C++, C#, Java, and Python"
 HOMEPAGE="http://www.antlr2.org/"
@@ -17,7 +22,8 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
 IUSE="doc debug examples mono +cxx +java python script source static-libs"
 
 # TODO do we actually need jdk at runtime?
-RDEPEND=">=virtual/jdk-1.3
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=virtual/jdk-1.3
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
@@ -52,19 +58,23 @@ make_shared_lib_macho() {
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
+	if use python ; then
+		python-single-r1_pkg_setup
 	fi
 }
 
 src_prepare() {
 	base_src_prepare
+
 	sed -i \
 		-e 's/install:.*this-install/install:/' \
 		lib/cpp/src/Makefile.in || die
 
 	use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
+
+	# See bug #468540, this can be removed once bug #469150 is fixed.
+	sed -i 's/tlib lib ar/ar/' configure.in || die
+	eautoreconf
 }
 
 src_configure() {
@@ -137,8 +147,8 @@ src_install() {
 	fi
 
 	if use python ; then
-		pushd lib/python > /dev/null
-		distutils_src_install
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_python_install
 		popd > /dev/null
 	fi
 
@@ -153,11 +163,3 @@ src_install() {
 
 	dodoc README.txt
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/dev-java/antlr/antlr-2.7.7.ebuild b/dev-java/antlr/antlr-2.7.7.ebuild
index 5d90edcd68d0..13dd5fd2dd7b 100644
--- a/dev-java/antlr/antlr-2.7.7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7.ebuild
@@ -1,11 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.18 2013/02/05 06:54:43 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.19 2013/05/09 11:45:47 tomwij Exp $
 
-EAPI="3"
-PYTHON_DEPEND="python? 2"
+EAPI="5"
 
-inherit base java-pkg-2 mono distutils multilib
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+DISTUTILS_OPTIONAL="y"
+DISTUTILS_SINGLE_IMPL="y"
+DISTUTILS_IN_SOURCE_BUILD="y"
+
+inherit base java-pkg-2 mono autotools distutils-r1 multilib
 
 DESCRIPTION="A parser generator for C++, C#, Java, and Python"
 HOMEPAGE="http://www.antlr2.org/"
@@ -17,7 +22,8 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc debug examples mono +cxx +java python script source"
 
 # TODO do we actually need jdk at runtime?
-RDEPEND=">=virtual/jdk-1.3
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=virtual/jdk-1.3
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
@@ -28,14 +34,17 @@ PATCHES=( "${FILESDIR}/2.7.7-gcc-4.3.patch" "${FILESDIR}/2.7.7-gcc-4.4.patch" "$
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
+	if use python ; then
+		python-single-r1_pkg_setup
 	fi
 }
 
 src_prepare() {
 	base_src_prepare
+
+	# See bug #468540, this can be removed once bug #469150 is fixed.
+	sed -i 's/tlib lib ar/ar/' configure.in || die
+	eautoreconf
 }
 
 src_configure() {
@@ -96,8 +105,9 @@ src_install() {
 	fi
 
 	if use python ; then
-		cd "${S}"/lib/python
-		distutils_src_install
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_python_install
+		popd > /dev/null
 	fi
 
 	if use examples ; then
@@ -114,11 +124,3 @@ src_install() {
 
 	newdoc "${S}"/README.txt README || die
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}