4 files changed, 54 insertions, 6 deletions
diff --git a/app-admin/python-updater/ChangeLog b/app-admin/python-updater/ChangeLog
index f6757bddff72..b2da5eab91ae 100644
--- a/app-admin/python-updater/ChangeLog
+++ b/app-admin/python-updater/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/python-updater
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/ChangeLog,v 1.53 2010/07/30 16:58:01 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/ChangeLog,v 1.54 2011/03/23 16:06:42 jer Exp $
+
+*python-updater-0.8-r1 (23 Mar 2011)
+
+  23 Mar 2011; Jeroen Roovers <jer@gentoo.org> -python-updater-0.8.ebuild,
+  +python-updater-0.8-r1.ebuild, +files/python-updater-0.8-splitdebug.patch:
+  Ignore splitdebug directories thanks to patch by Arfrever Frehtes Taifersar
+  Arahesis (bug #308579).
 
   30 Jul 2010; Jeroen Roovers <jer@gentoo.org> python-updater-0.8.ebuild:
   Stable for HPPA (bug #320043).
diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
index 4759e115c83a..0b7173b1c507 100644
--- a/app-admin/python-updater/Manifest
+++ b/app-admin/python-updater/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX python-updater-0.7-fix_import.patch 1251 RMD160 14ee61c0ff3bfd2f2823d499d4ed9ff675760195 SHA1 e948d3b11211c655c77b99e01cb19e84e559f666 SHA256 b0981f5c4f2bccc5056143e09897ca33a233f7bd1a04a05a288df760e02d4308
+AUX python-updater-0.8-splitdebug.patch 1144 RMD160 f39b9df37d3a7191ab0e149f65fe4c3dd2568c60 SHA1 782886e27927305d7293d4e9f4abde1a9a261b43 SHA256 b2e688e205b139d31e4f7b0836c68936f8f4b7b7acceb061ebf8823d9d808a9c
 DIST python-updater-0.7.tar.bz2 6436 RMD160 e85d3bbfd87f640c1c540855126ccd85ff073340 SHA1 0286e9f6b41587e5cc837b19b90e51ab3a281595 SHA256 cfcd89b94ac9cb6929c808fe94a774d2e3922a48aefd8ead871bbbf4682dc686
 DIST python-updater-0.8.tar.bz2 8137 RMD160 8988317da5d93046753fcd254c177cc2118aa06e SHA1 6a312a6ba9c23506990618af6072521a4deee9c1 SHA256 9e9cec0921fca089fa49fb72cbab5e9374a52c951febc377bbed02ac0142ba4f
 EBUILD python-updater-0.7-r1.ebuild 907 RMD160 2c4d57af9a34543abf3fbeef7f9d14c276f84b01 SHA1 f7e44b90862d6298f5d68307a19f2d0b980b2991 SHA256 49290f1c0cd5f6127837dbd4adee12344cbcf4f6e21cf466b68bcb6caa855256
 EBUILD python-updater-0.7.ebuild 768 RMD160 58db371b183df78cdf2b4a7dea3c2481057f6279 SHA1 1f3354402e6d8a922b4e965182f06c5070e826e7 SHA256 6538361b896ad16bb99b4125298dbdd2849e1bc1dcf1ec85adac8df671820cef
-EBUILD python-updater-0.8.ebuild 787 RMD160 6a329bc79b3a328cea8abecabe5fef4bc9685542 SHA1 bb0431c1cff76dba16164df4f73ea2327961258f SHA256 1fec8362626be5a94f1a89d5a4a65b91c140f6c861400c4fc010f6d0082bf7b7
+EBUILD python-updater-0.8-r1.ebuild 892 RMD160 867b455570bd0286127c511a05b87189465f5f55 SHA1 78eb60252998a2a167d8304dcb175bca34f34a47 SHA256 ae6442afdba39cd11fa4d5d5a4c21d5e985f2064f27aab1f2b0fcb8362c3576b
 EBUILD python-updater-9999.ebuild 851 RMD160 40840365eb588679fa9c9390f5c7bed224f56125 SHA1 86573d1e9f5ca70b41507457de42ec82a592dc30 SHA256 d89c17fef67c69bb7b65dfc470bb6093886fbbe79a537f68b296563d538e5df5
-MISC ChangeLog 6872 RMD160 3eb4d65fad9ca342ac3b15722c449fa4c173020e SHA1 2ca18acc3feee12196d1e0586923d5f712219a4f SHA256 7c30a83f6a22266743759e1f03e8cb295d30edc700205c7f7c43c73172841bad
+MISC ChangeLog 7167 RMD160 3bce0c969c9d017c375b9162adda913d75e9c0c4 SHA1 7643643aaf13ecc274b1c22dee2071fecdf3fcec SHA256 7461af6e7383109c1c8ff3acf4d4c7d46006f6e3ac5b5230a81bb6407ad5abb2
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2KGpwACgkQVWmRsqeSphOg+QCfdyfE5a6dBzgLt12FdGwOEPQ3
+EA8An14Or4AQBe/liJyO4AJ5/vrjgOrF
+=TBiB
+-----END PGP SIGNATURE-----
diff --git a/app-admin/python-updater/files/python-updater-0.8-splitdebug.patch b/app-admin/python-updater/files/python-updater-0.8-splitdebug.patch
new file mode 100644
index 000000000000..f898228c7632
--- /dev/null
+++ b/app-admin/python-updater/files/python-updater-0.8-splitdebug.patch
@@ -0,0 +1,22 @@
+Index: python-updater
+===================================================================
+--- python-updater	(revision 358)
++++ python-updater	(working copy)
+@@ -554,7 +554,7 @@
+     fi
+ 
+     if [[ CHECK_STATIC_LINKING -ne 0 ]]; then
+-        binaries="$(scanelf -qs +Py_Initialize < <(grep -E "^obj" "${content}" | cut -d" " -f2) | sed "s/.* //")"
++        binaries="$(scanelf -qs +Py_Initialize < <(grep -E "^obj" "${content}" | cut -d" " -f2 | grep -Ev "^/usr/lib(32|64)?/debug/") | sed "s/.* //")"
+         if [[ -n "${binaries}" ]]; then
+             PKGS_TO_REMERGE+=" ${CATPKGVER}"
+             eindent
+@@ -613,7 +613,7 @@
+     fi
+ 
+     if [[ CHECK_SHARED_LINKING -ne 0 ]]; then
+-        binaries="$(scanelf -qF "%F %n" < <(grep -E "^obj" "${content}" | cut -d" " -f2) | grep -E "( |,)$(get_OLD_PYTHON_SHARED_LIBRARIES_REGEX)(,|$)")"
++        binaries="$(scanelf -qF "%F %n" < <(grep -E "^obj" "${content}" | cut -d" " -f2 | grep -Ev "^/usr/lib(32|64)?/debug/") | grep -E "( |,)$(get_OLD_PYTHON_SHARED_LIBRARIES_REGEX)(,|$)")"
+         if [[ -n "${binaries}" ]]; then
+             PKGS_TO_REMERGE+=" ${CATPKGVER}"
+             eindent
diff --git a/app-admin/python-updater/python-updater-0.8.ebuild b/app-admin/python-updater/python-updater-0.8-r1.ebuild
index e240a6783849..dabe14646ba0 100644
--- a/app-admin/python-updater/python-updater-0.8.ebuild
+++ b/app-admin/python-updater/python-updater-0.8-r1.ebuild
@@ -1,6 +1,8 @@
-# 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-admin/python-updater/python-updater-0.8.ebuild,v 1.8 2010/07/30 16:58:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.8-r1.ebuild,v 1.1 2011/03/23 16:06:42 jer Exp $
+
+inherit eutils
 
 DESCRIPTION="Script used to remerge python packages when changing Python version."
 HOMEPAGE="http://www.gentoo.org/proj/en/Python"
@@ -16,6 +18,12 @@ RDEPEND="!<dev-lang/python-2.3.6-r2
 	dev-lang/python
 	|| ( >=sys-apps/portage-2.1.2 sys-apps/paludis )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-splitdebug.patch
+}
+
 src_install() {
 	dosbin ${PN} || die "dosbin failed"
 	doman ${PN}.1 || die "doman failed"