Apply configure patch, bug 269029, thanks to Jens Rutschmann

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

4 files changed, 59 insertions, 6 deletions

diff --git a/kde-base/dcoppython/ChangeLog b/kde-base/dcoppython/ChangeLog
index f715befc478d..0707da50f342 100644
--- a/kde-base/dcoppython/ChangeLog
+++ b/kde-base/dcoppython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/dcoppython
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.74 2009/04/16 19:19:41 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.75 2009/05/27 22:28:38 tampakrap Exp $
+
+  27 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  dcoppython-3.5.10.ebuild,
+  +files/dcoppython-3.5.10-python2.6-configure.patch:
+  Apply configure patch, bug 269029, thanks to Jens Rutschmann
 
   16 Apr 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   +files/dcoppython-3.5.10-python-2.6.patch, dcoppython-3.5.10.ebuild:
diff --git a/kde-base/dcoppython/Manifest b/kde-base/dcoppython/Manifest
index a025b588e37b..875f3a0909f5 100644
--- a/kde-base/dcoppython/Manifest
+++ b/kde-base/dcoppython/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dcoppython-3.5.10-python-2.6.patch 1241 RMD160 4657fa78582e8a2446600b029ebc09b73336d6a8 SHA1 787dfb5b517a163c8b61dc6aa1750c8c35eca7cd SHA256 679d2c1b9f6b95437d1ed94b1795fb97233c5793b98cbde1ed21df9cf644cb42
+AUX dcoppython-3.5.10-python2.6-configure.patch 984 RMD160 8c637a5a70318dc747c6ce88ec30963c54d18139 SHA1 281b90b2d4d891d996ba2e44b674b657f145fdef SHA256 1367ac692955660627c9e49b171020ac32f9e0dad2b4053d8f913b20f7e5acdf
 AUX dcoppython-3.5.5-python-2.5-compat.diff 344 RMD160 3bb751206caa57e119eeaa136a310e2a409521ab SHA1 047776da3bf7b9852559371bf66d8b6e437e407a SHA256 14bcb76dd5850ea3480d711719682b006009beaa4c2b2039acfdc6174adf0f9c
 AUX dcoppython-3.5.6-python-2.4.patch 640 RMD160 dddb1876406fe73fdc2987ac49a10a2887600777 SHA1 ebaef9c18e9c4d452f8b0b22414db601a74da18f SHA256 dee6b5f32babb0d2e3c8c982fa8a0d13df85ec92f64db9cc264f093707f3233d
 AUX no-gtk-glib-check.diff 949 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da SHA1 234a650d3b629e41b2249ae99e6f7b0ee44fcf63 SHA256 f2721c8a1567ab9e259e216372a6552f8910fd33bc82390d8556aff00b0ba8df
 DIST kdebindings-3.5.10.tar.bz2 5735439 RMD160 0c6b4690455a131c90a1e27a3345aa2a2e9d6b99 SHA1 42946974889ec44a1eb9c54c8b0832d6f1af6719 SHA256 438fb601ec109f542aa721abad0d21b424e6225e3fd3081919981a69ad59b6ad
 DIST kdebindings-3.5.9.tar.bz2 5737416 RMD160 c2c906a61c72eb8edfb6f9b82d74b7cc2d0c222c SHA1 14fcec6c93bffa94b10201dd03d87ffcd6fb5281 SHA256 76e2c05970d1edd15fc3850296ae791d7da0b19759794209dbb743919f5434ea
-EBUILD dcoppython-3.5.10.ebuild 720 RMD160 912df2a113e9bf9e47fa732091812847612efdc8 SHA1 d532c501a4bcbb9d3c8cc24a0d1576b1fa68aa77 SHA256 8580ada185ca4e1dec85f063b5550b21cbd0c5c8a995ad5d10f3b0e9f3d62347
+EBUILD dcoppython-3.5.10.ebuild 795 RMD160 b563c394c2c8ace5658d2f3523bdf29f970d268e SHA1 c9cfe475e2349c36af4644ab990e2d28755f3495 SHA256 8815abe0a9acbc96650e36d90ef67ce6e20d688b927848efb62a66d8340455d4
 EBUILD dcoppython-3.5.9.ebuild 713 RMD160 4d06e9f447086c1f9b589195351d07d3db920e58 SHA1 52287caf94eae59e3296fdd5fc5476572fa38340 SHA256 f52c399986944333e2cf3f587a3474222e3d0282f455772a5594c0c11d9ae586
-MISC ChangeLog 9926 RMD160 a935c06fe7fe86172235a5a7399d8b95db5ea3a6 SHA1 aea4f6d81ed4f501bcb2ecb1e389ea9174e705ac SHA256 1dfca99511487f0a6f48fc1f6395136d6e602df456ab09a308fa85391a0e2c5a
+MISC ChangeLog 10128 RMD160 787bea157a2c4993f1876b8c1966b53bd9278753 SHA1 860f82e580c493748dec1ac9379f07f3680fe418 SHA256 f50871b769cdfa9019ecd2ae2f8c6e4df37f82cbc5701ca4b8a4efa7af054cf9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkodvqEACgkQjDdoMVfcAHiaQwCdHCFR5dbmzXyWswQG8sOicdfH
+/cEAoN92nsZ9bzPwV4/cG4i99CJdrV0M
+=gsPe
+-----END PGP SIGNATURE-----
diff --git a/kde-base/dcoppython/dcoppython-3.5.10.ebuild b/kde-base/dcoppython/dcoppython-3.5.10.ebuild
index bd0263e33c5d..2394824d1818 100644
--- a/kde-base/dcoppython/dcoppython-3.5.10.ebuild
+++ b/kde-base/dcoppython/dcoppython-3.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.10.ebuild,v 1.2 2009/04/16 19:19:41 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.10.ebuild,v 1.3 2009/05/27 22:28:38 tampakrap Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -11,13 +11,15 @@ DESCRIPTION="KDE: Python bindings for DCOP"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="virtual/python"
+RDEPEND="${DEPEND}"
 
 # Because this installs into /usr/lib/python2.3/..., it doesn't have SLOT=X.Y like the rest of KDE,
 # and it installs into /usr entirely
 SLOT="0"
 
-PATCHES="$FILESDIR/no-gtk-glib-check.diff
-	 $FILESDIR/${P}-python-2.6.patch"
+PATCHES=( "$FILESDIR/no-gtk-glib-check.diff"
+	 "${FILESDIR}/${P}-python-2.6.patch"
+	 "${FILESDIR}/${P}-python2.6-configure.patch" )
 
 src_compile() {
 	myconf="${myconf} --prefix=/usr"
diff --git a/kde-base/dcoppython/files/dcoppython-3.5.10-python2.6-configure.patch b/kde-base/dcoppython/files/dcoppython-3.5.10-python2.6-configure.patch
new file mode 100644
index 000000000000..ef7a75ff07b3
--- /dev/null
+++ b/kde-base/dcoppython/files/dcoppython-3.5.10-python2.6-configure.patch
@@ -0,0 +1,35 @@
+--- admin/acinclude.m4.in.old	2008-08-19 22:20:50.000000000 +0200
++++ admin/acinclude.m4.in	2009-05-08 16:04:24.000000000 +0200
+@@ -4649,18 +4649,20 @@
+ 
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+-  KDE_CHECK_PYTHON_INTERN("2.5",
+-    [KDE_CHECK_PYTHON_INTERN("2.4",
+-     [KDE_CHECK_PYTHON_INTERN("2.3", 
+-       [KDE_CHECK_PYTHON_INTERN("2.2", 
+-         [KDE_CHECK_PYTHON_INTERN("2.1", 
+-           [KDE_CHECK_PYTHON_INTERN("2.0", 
+-             [KDE_CHECK_PYTHON_INTERN($1, $2) ])
+-           ])
+-         ])
+-       ])
+-     ])
+-  ])
++  KDE_CHECK_PYTHON_INTERN("2.6",
++    [KDE_CHECK_PYTHON_INTERN("2.5",
++      [KDE_CHECK_PYTHON_INTERN("2.4",
++        [KDE_CHECK_PYTHON_INTERN("2.3", 
++          [KDE_CHECK_PYTHON_INTERN("2.2", 
++            [KDE_CHECK_PYTHON_INTERN("2.1", 
++              [KDE_CHECK_PYTHON_INTERN("2.0", 
++                [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++              ])
++            ])
++          ])
++        ])
++      ])
++    ])
+ ])
+ 
+ AC_DEFUN([KDE_CHECK_STL],