Fix compilation error with USE="python", bug #271855, and fix missing EAPI="2"

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 67 insertions, 14 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index ddc4f5a4a03d..12b6c47f7a26 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.110 2009/05/18 20:57:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.111 2009/06/21 11:53:44 mrpouet Exp $
+
+  21 Jun 2009; <mrpouet@gentoo.org> dia-0.97.ebuild,
+  +files/dia-0.97-acinclude-python-fixes.patch:
+  Fix compilation error with USE="python", bug #271855, and fix missing EAPI="2"
 
 *dia-0.97 (18 May 2009)
 
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 5495be96812e..508fda1ce6fe 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dia-0.96.1-64bit-fixes.patch 323 RMD160 5e290e07b95e085eae7d57bee397bdcc1fb51b2c SHA1 eb3272698bcde66ca73393cda06b902a01d6be2a SHA256 f9f7dfa91d8795b76c0958d874b59bba8301970d9836a8fea3ea5a21ebca59ab
 AUX dia-0.96.1-gnome-doc.patch 3322 RMD160 50ec2d4c14a267ab350d5dcdf95ae93a68f17f62 SHA1 0d474985c2d0849323dc0e9d2938b1fd2ead2f9b SHA256 92ee349e6bb13f68821aa9cf36dc239f4f83a7a61936967d261e837efe1f5bf6
 AUX dia-0.96.1-xml-fixes.patch 1064 RMD160 2e3e15a605a76ac87458af4c81380ae2c1c0f863 SHA1 5b93651e9c898a3be1fc84090c4331def8f69207 SHA256 b128d7aada1c8c050a30389ff79e9e70dc444e1fb7c2428974324ec65570e1e9
+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.95-1.tar.bz2 4203188 RMD160 680102d2da144c1a720a61e5b85c030f353000cc SHA1 887482cd25735ede7465302cb10b8c3efdc1da15 SHA256 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
 DIST dia-0.96.1.tar.bz2 4445553 RMD160 aef7b2227be2fb7eb5bdd31536790e868af74311 SHA1 e3d8f16f50dbbd03c1ce0235dba28c3e9612bb6e SHA256 7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237
 DIST dia-0.97.tar.bz2 6736670 RMD160 1b2869e2ebdd2f37b908ab3166e529aec1862af6 SHA1 1c5a727e9e4f59b823a4616fc881055006eb8b96 SHA256 9083382bd5435b6d6324fc601f359a7c759504e48adbcece0a7d5c45a76ccf5a
 EBUILD dia-0.95.1.ebuild 1730 RMD160 d55dd6661fee0332bd35fece05d58a49d5d4b982 SHA1 14e67aa90cf656077d23b8355603e794ee52959f SHA256 fbfe966d794f813c4e836181853556f1348dc6dcf439519fb1198bd319ebe8ae
 EBUILD dia-0.96.1-r1.ebuild 2561 RMD160 e4f8bbff497cc77e3cd97c36c3871705d23f3694 SHA1 a79a26bb4b1ddf09e84ba5adf3ef738418f0bff6 SHA256 492e32f4360b095094f04a850d0434213a57518d1662e20174810f6aacc92efe
-EBUILD dia-0.97.ebuild 2327 RMD160 47c757979a33ca7a6b53f2dab111f38079d07784 SHA1 eff92924c32f11112e5e2f8a6799d2a360da6d98 SHA256 c8b98fc6a2034290826b5762dd0f18daee1a36091d75c163d865bae6b94aaa77
-MISC ChangeLog 14195 RMD160 80941ce1896fa71f3db320b600f28a96f70c25fd SHA1 f9370e2ae8308f3541649971089abd879a1ca932 SHA256 ce3a9925aab5450eefb22690c3b3e930443d8892ce9dc75911d6c7f2152e5a63
+EBUILD dia-0.97.ebuild 2474 RMD160 9210bbad7326bb1ab992eacee3e14a6342d6ffd5 SHA1 0aa504e027fa9fdc9988f35dfa184f4456241c51 SHA256 afdef8fca71b3baafd55c7ddac225cbf10974ec6ab40c91596688c7e577f4d55
+MISC ChangeLog 14382 RMD160 2a42e9e768af1fc996b3bc352949ff56c33b0b7a SHA1 1c34f6f9297d9ea0ef9df27dccff98583c758a51 SHA256 bd93d828fe0ede106048db3b54503a7d26309d4cd857e813d9b3da3d670b6ad9
 MISC metadata.xml 687 RMD160 061a68c1fb154961a49f0e477c60e5622203ee9c SHA1 04993b30fa3d405bb573fb1590063b7300b2bbfe SHA256 bdcc845e385aea41bab345156554851037e00f1d268801d05e922f375ab97145
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoRy80ACgkQ1fmVwcYIWAZKFgCfRSJ6OGxpHGb49hTuWlv2NNsk
-24AAoJXnwWF+XhhtkEvzuMhLcZ/U/yTs
-=g10q
------END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.97.ebuild b/app-office/dia/dia-0.97.ebuild
index 9a1587fdf7fd..c6513205a82b 100644
--- a/app-office/dia/dia-0.97.ebuild
+++ b/app-office/dia/dia-0.97.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.ebuild,v 1.1 2009/05/18 20:57:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.ebuild,v 1.2 2009/06/21 11:53:44 mrpouet Exp $
+
+EAPI="2"
 
 inherit eutils gnome2 libtool autotools versionator python
 
@@ -67,6 +69,11 @@ src_prepare() {
 	# Fix compilation in a gnome environment, bug #159831
 	epatch "${FILESDIR}/${PN}-0.97.0-gnome-doc.patch"
 
+	# Fix compilation with USE="python", bug #271855
+	if use python; then
+		epatch "${FILESDIR}/${P}-acinclude-python-fixes.patch"
+	fi
+
 	# Skip man generation
 	if use doc; then
 		sed -i -e '/if HAVE_DB2MAN/,/man_MANS/d' doc/*/Makefile.am \
diff --git a/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch b/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch
new file mode 100644
index 000000000000..cbb69f05bfc9
--- /dev/null
+++ b/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch
@@ -0,0 +1,51 @@
+ acinclude.m4 |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 57a2188..1bf3ad0 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -128,7 +128,7 @@ else:
+   AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+     [am_cv_python_pythondir],
+     [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
++     echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`])
+   AC_SUBST([pythondir], [$am_cv_python_pythondir])
+ 
+   dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+@@ -145,7 +145,7 @@ else:
+   AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+     [am_cv_python_pyexecdir],
+     [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
++     echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`])
+   AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+ 
+   dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+@@ -202,6 +202,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
++py_lib=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)" | cut -d '/' -f 3`
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+ if test "$py_prefix" != "$py_exec_prefix"; then
+@@ -225,7 +226,7 @@ AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ 
+ AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
+ 
+-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
++py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
+ 
+ py_makefile="${py_config_dir}/Makefile"
+ if test -f "$py_makefile"; then
+@@ -235,7 +236,7 @@ dnl extra required libs
+   py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
+ 
+ dnl now the actual libpython
+-  if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
++  if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
+     PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
+     AC_MSG_RESULT(found)
+   else