Let it compile when python3 is main interpreter. Bump to eapi3.

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

3 files changed, 22 insertions, 18 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 42729c34ced2..e581e2d15fc5 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/dia
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.129 2010/09/09 16:50:19 pacho Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.130 2011/01/26 14:47:50 pacho Exp $
+
+  26 Jan 2011; Pacho Ramos <pacho@gentoo.org> dia-0.97.1.ebuild:
+  Let it compile when python3 is main interpreter. Bump to eapi3.
 
   09 Sep 2010; Pacho Ramos <pacho@gentoo.org> dia-0.97.1.ebuild:
   Don't use -DGTK_DISABLE_DEPRECATED (bug #333439) and RDEPEND on gtk+:2.
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index a40f9a7fc991..2ff228fbac58 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX dia-0.97-acinclude-python-fixes.patch 2524 RMD160 0383fe7394fa1dc21fc734e39077b5f743ec0987 SHA1 054b6a43a4cb6dc7243dfa2fa7d6412687bf07e9 SHA256 a4c56ee5b05c01253936b7f9ed4d5b796e8f00a5148e94f7b9bba598595e484c
 AUX dia-0.97.0-gnome-doc.patch 1961 RMD160 ccc2b5273b8fe030294041ca3277ad28cec8bea6 SHA1 13ee9f0923ecf48b5fbf3e5cf7448ea8985c4bfb SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6
 DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
-EBUILD dia-0.97.1.ebuild 2669 RMD160 b4e67ca027b117d4b8d2e1aebbd45f7f8f71b6ef SHA1 db5bdaf94b9ac484c3835faa5cc38f2445c654e6 SHA256 4613ff3466feca41dc10e8efb6cee9c5896012bb312d8124759d4c6415270f80
-MISC ChangeLog 17040 RMD160 d662314009408fe01bcebab2d48e633e40f0fdb8 SHA1 7300533f8384a8aa66936fa63eb5c3d1686caad6 SHA256 32d6461799ee640c9d870430a1d3acd5e1e4061448c9ddcd6e2c611dffda18d0
+EBUILD dia-0.97.1.ebuild 2718 RMD160 55eb73fb34f51b0de5867888337d53a784aed46f SHA1 7b3ba609e404a2a76531b08fcb4a905f2ce66541 SHA256 e89351116bf9066d61feb90c3c23307a004628e63a054642b6dac37bf51b68b0
+MISC ChangeLog 17172 RMD160 ca151bcecefe36565c3b04c1a71f958fb3d888e3 SHA1 69c37d7c59eb891fdf3b4987d8862758a73e0e30 SHA256 d8738582e2491a624583ade5f3c6ace59b9514c19e046d102f78302207ba4031
 MISC metadata.xml 578 RMD160 f6c695b300f590287280f5d79e363e83e4f066d7 SHA1 a621978dd1772191b84c756071af83cea2e76436 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyJEFQACgkQCaWpQKGI+9RJugCfVr9ZIcz20nEL8uZlXOnYc7N8
-5EkAn2b9+CS0Ojb1JBuluulyRYyhOkUl
-=asWJ
+iEUEARECAAYFAk1ANB0ACgkQCaWpQKGI+9Tp5ACYjNNh+SzFq5ZbHBkGqwKPeGAy
+ugCfVnv4lnQHGElfzazYmkf2bicyJa8=
+=7l3S
 -----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild
index 781853cbd6f9..60d3bcccd575 100644
--- a/app-office/dia/dia-0.97.1.ebuild
+++ b/app-office/dia/dia-0.97.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.10 2010/09/09 16:50:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.11 2011/01/26 14:47:50 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="python? 2"
 
 inherit eutils gnome2 libtool autotools versionator python
 
@@ -18,7 +20,6 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 # the doc USE flag doesn't seem to do anything without docbook2html
-# FIXME: configure mixes debug and devel meaning (see -DGTK_DISABLE...)
 IUSE="cairo doc gnome png python zlib"
 
 RDEPEND=">=x11-libs/gtk+-2.6.0:2
@@ -36,9 +37,7 @@ RDEPEND=">=x11-libs/gtk+-2.6.0:2
 		>=gnome-base/libgnome-2.0
 		>=gnome-base/libgnomeui-2.0 )
 	cairo? ( >=x11-libs/cairo-1 )
-	python? (
-		>=dev-lang/python-1.5.2
-		>=dev-python/pygtk-1.99 )
+	python? ( >=dev-python/pygtk-1.99 )
 	doc? (
 		~app-text/docbook-xml-dtd-4.5
 		 app-text/docbook-xsl-stylesheets )"
@@ -48,9 +47,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( dev-libs/libxslt )"
 
-DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
 	G2CONF="${G2CONF}
 		$(use_with cairo)
 		$(use_with python)
@@ -61,6 +59,7 @@ pkg_setup() {
 		--without-hardbooks
 		--disable-static
 		--docdir=/usr/share/doc/${PF}"
+	use python && python_set_active_version 2
 }
 
 src_prepare() {
@@ -83,13 +82,15 @@ src_prepare() {
 	# Don't use -DGTK_DISABLE_DEPRECATED, bug #333439
 	sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' configure.in || die "sed 3 failed"
 
+	use python && python_convert_shebangs -r 2 .
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
 
 src_install() {
 	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "failed to remove *.la"
+	find "${ED}" -name "*.la" -delete || die "failed to remove *.la"
 }
 
 pkg_postinst() {
@@ -102,5 +103,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/share/dia
+	use python && python_mod_cleanup /usr/share/dia
 }