Python ABI fixes

(Portage version: 2.2_rc67/git/Linux x86_64)
 (Signed Manifest commit)

3 files changed, 27 insertions, 23 deletions

diff --git a/dev-vcs/mercurial-server/ChangeLog b/dev-vcs/mercurial-server/ChangeLog
index c5ed60103..09af57c5d 100644
--- a/dev-vcs/mercurial-server/ChangeLog
+++ b/dev-vcs/mercurial-server/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  mercurial-server-1.0.1.ebuild:
+  Python ABI fixes
+
   11 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
   mercurial-server-1.0.1.ebuild:
   fixed bug #286695#c8 (tnx to Domen Kozar)
diff --git a/dev-vcs/mercurial-server/Manifest b/dev-vcs/mercurial-server/Manifest
index bedf3d020..e40a59145 100644
--- a/dev-vcs/mercurial-server/Manifest
+++ b/dev-vcs/mercurial-server/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX mercurial-server-0.9-docbook-path.patch 1038 RMD160 41262720f38576b47bdbb8a22097f54ddaa57c25 SHA1 52bc6cfd6fb1ff125b65f1a4a58e4b672ab3895e SHA256 7f443fe6f54fd62db06c93ae8340cda2e1e39052f0121cdf13fa68aa11630c7e
 DIST mercurial-server_1.0.1.tar.gz 20302 RMD160 e6ba21bca38f4b9cb48229fe000779dcf9b39072 SHA1 9f9b5b4a6f2a0cbbae8374db744350561618ff8d SHA256 6d67b8584730883c83972d35cf77bd1b45e7d2222458c5c3ac4ae94b3ec8f1ee
-EBUILD mercurial-server-1.0.1.ebuild 2261 RMD160 1e5fc37cc2d53a39e953fed8af1287d70251f844 SHA1 35dcf27c77711b05f4af45dbefeae4ada4059ef2 SHA256 b478617307c932b9497fca2b7318f30f1cec1d145347b2929c264c0495f80f47
-MISC ChangeLog 1427 RMD160 12656adf202b9e1a3c266928c4879fdd7d0eaa55 SHA1 0346bf05f3819b9bf17c913daff5bcc206a2772e SHA256 e041e2718724304c486bbd5c99c2f13c040487e97fd94eaa25958f4145ca9ca1
+EBUILD mercurial-server-1.0.1.ebuild 2333 RMD160 bf8d9463239e38d3d3012979458034817352cae4 SHA1 cf7d74fac9737d1a7166b9fcbeceda769511baa1 SHA256 90e5a9bff96e65bc3136d156d11290efa473494c1592a05345ae068a219504f9
+MISC ChangeLog 1527 RMD160 b6e5b207408f32ae09cd6cae9fd3be2015ccf9cc SHA1 04e0f5252694ed5a685901c59f4af2cbd216b63c SHA256 35d8bd707a9eb39cb7072d6563b072f38fc5f5c4d2324bfd0b6d653aa9eb0e9d
 MISC metadata.xml 220 RMD160 fd3dba7eeac39bb91e6658be7d4d846249c1c329 SHA1 0aafe188f55c4c22697755bea33de012cccf3f49 SHA256 0b5c322d93461039b700509ae2671b429f0637f66596c61e48ebba9e365c9f92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuZWMwACgkQy0OE/ans1/mc3ACcCOPln3DkjkGNubiSZG2CIfW2
-1ycAnRweHT0Qtdkdjj6EHOo1KJSTCYUJ
-=DD+v
+iEYEARECAAYFAkwnjEUACgkQgAnW8HDreRbI0QCg0d/neVHR+cXuUmYpneSd0lYS
+EuIAoI2QvQ6Mq57WT9NngIU8VOsCz8l0
+=jNzi
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild b/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild
index 93e4ef8ef..fa4b18f45 100644
--- a/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild
+++ b/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
-inherit eutils
+PYTHON_DEPEND="2"
+
+inherit eutils python
 
 DESCRIPTION="Mercurial authentication and authorization tools"
 HOMEPAGE="http://www.lshift.net/mercurial-server.html"
@@ -15,41 +17,39 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND="dev-vcs/mercurial
-	dev-lang/python
+RDEPEND="dev-vcs/mercurial"
+DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt"
 
-RDEPEND="dev-vcs/mercurial
-	dev-lang/python"
-
 S="${WORKDIR}/${PN}_${PV}.orig"
 
 pkg_setup() {
 	enewgroup hg
 	enewuser hg -1 /bin/sh /home/hg hg
 	chmod 700 /home/hg
+	python_set_active_version 2
 }
 
 src_compile() {
-	emake DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets || die "emake failed"
+	emake DOCBOOK_XSL="${EPREFIX}"/usr/share/sgml/docbook/xsl-stylesheets || die "emake failed"
 }
 
 src_install() {
-	emake installfiles PREFIX=/usr/share DOCDIR="/usr/share/doc/${PF}" DESTDIR="${D}"
+	emake installfiles PREFIX="${EPREFIX}"/usr/share DOCDIR="${EPREFIX}/usr/share/doc/${PF}" DESTDIR="${D}" || die
 }
 
 pkg_postinst() {
 	#skip the comments if there is already a hgadmin repo
-	if [ ! -d /home/hg/repos/hgadmin/.hg ]; then
-		#Parts could be done automatically, but maybe there is a user hg 
+	if [ ! -d "${EPREFIX}"/home/hg/repos/hgadmin/.hg ]; then
+		#Parts could be done automatically, but maybe there is a user hg
 		elog "This seem to be a first time install, things you may want to do"
 		elog "-Add your public ssh key to root key folder"
-		elog "  sudo cp ~/.ssh/id_rsa.pub ${ROOT}etc/mercurial-server/keys/root/\${USER}"
+		elog "  sudo cp ~/.ssh/id_rsa.pub ${EROOT}etc/mercurial-server/keys/root/\${USER}"
 		elog "-Create hgadmin repo"
-		elog "  sudo -H -u hg ${ROOT}usr/share/mercurial-server/init/hginit ${ROOT}usr/share/mercurial-server"
+		elog "  sudo -H -u hg ${EROOT}usr/share/mercurial-server/init/hginit ${EROOT}usr/share/mercurial-server"
 		elog "-Init hg's ssh authorized_keys file"
-		elog "  sudo -H -u hg ${ROOT}usr/share/mercurial-server/refresh-auth"
+		elog "  sudo -H -u hg ${EROOT}usr/share/mercurial-server/refresh-auth"
 		elog "-Clone hgadmin repo"
 		elog "  hg clone ssh://hg@localhost/hgadmin hgadmin"
 		elog "-Start administration"
@@ -60,10 +60,10 @@ pkg_postinst() {
 		elog "  hg add"
 		elog "  hg commit -m 'initial commit'"
 		elog "  hg push ssh://hg@localhost/hgadmin"
-		elog "-Remove the key in ${ROOT}etc/mercurial-server/keys/root"
-		elog "  rm ${ROOT}etc/mercurial-server/keys/root/\${USER}"
+		elog "-Remove the key in ${EROOT}etc/mercurial-server/keys/root"
+		elog "  rm ${EROOT}etc/mercurial-server/keys/root/\${USER}"
 	fi
 	ewarn "If you are upgrading from an older version of ${PN}, please take a look at"
-	ewarn "${ROOT}usr/share/mercurial-server/init/dot-mercurial-server"
+	ewarn "${EROOT}usr/share/mercurial-server/init/dot-mercurial-server"
 	ewarn "and add missing lines to ~hg/.mercurial-server"
 }