Don't install non-working binary stuff into DOCDIR (bug #364393 by ago).

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 23 insertions, 24 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index f7505b500843..18289dbc3faf 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.142 2011/04/20 07:45:23 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.143 2011/04/22 05:56:08 dirtyepic Exp $
+
+  22 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.11.0.ebuild,
+  wxpython-2.8.12.0.ebuild:
+  Don't install non-working binary stuff into DOCDIR (bug #364393 by ago).
 
 *wxpython-2.8.12.0 (20 Apr 2011)
 
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 74905ac1be1d..363592b78aaf 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -25,25 +25,15 @@ DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4a
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
 EBUILD wxpython-2.6.4.0-r2.ebuild 3575 RMD160 e98b4ed5d66c10061ac28fac635d8d0f1d5c761d SHA1 6e54f848057fd4edbcfd41565b7345633b0d521b SHA256 b670af6696125128c1d98b3bb4085652a82ff0e776d7c8bcfc9b8a0bd3e51a76
 EBUILD wxpython-2.8.10.1.ebuild 5392 RMD160 b57c9d3fedc1520011182b32cd7df9a51f821fd2 SHA1 0a9a5d1060f27de8dce94a98519e1995de728763 SHA256 04ec3086543c4e75b114126b64f3428cc1916392afda6904e484175c1523d864
-EBUILD wxpython-2.8.11.0.ebuild 5406 RMD160 0c7dc99b637ce318c19e264041ede137700478f4 SHA1 811d5b924c4a3d68038b2c5a6a36ebb2cb7dde39 SHA256 01c7270a5e58ed8c242382adc93b04432eccb43248ae2ee86705ce213ef65a65
-EBUILD wxpython-2.8.12.0.ebuild 5399 RMD160 60d25584dc422f9f68c2fe3ebcf27600a7eb515b SHA1 0db847c671516eeb18efbd72644ebd6fb4942a7e SHA256 855f03e7b784719a48bbaa0da164ace4fed3fa0fbbc97ad8665b5b7bc4d1f0aa
+EBUILD wxpython-2.8.11.0.ebuild 5467 RMD160 9f4a3853385ee2c20525ac44b69d8f722ef10f7c SHA1 622e6b0792c9f62c9b47f31595843e894339081d SHA256 47f2056935199646112d341f2fb9eeaa7ed924563cad416076bb14bb4954b680
+EBUILD wxpython-2.8.12.0.ebuild 5479 RMD160 c8a5a72d867d8ac066021fa54ddd87e63fc7aa1f SHA1 5996ddf034bc6663ee142bd2b14150b0c3500654 SHA256 5665683612d6f812f7aedb3a7002d725a20879fb5e5825d4b75b0ef2628b0d3f
 EBUILD wxpython-2.9.1.1.ebuild 4943 RMD160 547558442c83bbc874ec088c581393fef22c2c73 SHA1 62db1bc37fb8e0a65129270d54801a8ef2ab4440 SHA256 4350e3a00af3fee267764b6077ec373e7f6f8997ab2baeeca6c4325f9e7ab5f2
-MISC ChangeLog 26485 RMD160 e8eb0a366d62bcbc3d261fd5baddc9d9daf6e9b7 SHA1 fe7fe8b114941945f5f6a964cfaf1d3d4e078f9c SHA256 764e02a0e690286dd1a7cd57deccc262a99b845fe6942558d2033ce7be1f2587
+MISC ChangeLog 26663 RMD160 a96fc35accb95715712d321269f9b79c4a4de5ce SHA1 9d89dd10719a8b35e870e106d4d95d703eaa8871 SHA256 348a0a6fe54ce82b72f318cbcd14d6a985e2eaadc0e85537c73bc8d296a29a79
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNr4ZWAAoJENgZr6v6gHY0zR0P/2yc+/w9UlvCXHoCrrkf7OCR
-gryHTAH6IdD+IboBtcvLCA+xl3iIuE3NlWNrRZ1FeIyl2tkAXiWw6oKkpTsBb1si
-NPvaaWuPwNsDt3yo2vvgOoghhBvQZPlZi9VBcMcIas8BTSG2JIaMq19i6DXshqYC
-dDbd9Wu2LGfWu5qaQzN1VaAY1imktLV3/MauIFSlAgG3EPETRZCQaONG2gL0kg6i
-HWZsMFlkra7NaEHdAWk5mJYE5HcBIL4x/T7b7dkKtrcG2cwlKPeSsWWCEbAZcYpb
-5JPOgfsge+7Y+LlBrY0aFtuxWSikjY7csTzV3M2iKHMNMdoLKfz0GpytFTFM5i9+
-BWZOyJ78Ue7pGJXMgx5b2YJ9TpmOyM2E5es3IEW5qW9fkzZ4zMgqfVT9R1AGg7aj
-0D7lPihh2FIF/scFlcOZSClchQukbPEHpVAzuJfZ+6l6cyyLVhvQzMBw5W87Nd9J
-wV9rmCiS2/iOyktFrm9nC10FLoV4eTPvFlvphr+RWOPtbTeRBApKKrorUTAwTIEa
-cRCFlfzIoiPXyN5usFus7rdAnnpk4rCNuKfktrh0wP/WmhYvJaj8WYvXqGMAkqmj
-cIvxT0Nrc8ADjJ0O+W/WBOVUNjSnQX7EMXxdPLG+7wLogFraOvOk5kcFbHW+XfG9
-gWcC/aQRP0iSMHTYBg0d
-=kFM1
+iEYEARECAAYFAk2xGfkACgkQiqiDRvmkBmKVcQCbBDjGETjNUbERPnn0+NT2YNKO
+dO4AoJpHp1tFEML6hnL0dpZCV5p79PUj
+=0ZiA
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.8.11.0.ebuild b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
index ba3dba46c8b7..05403f905ef2 100644
--- a/dev-python/wxpython/wxpython-2.8.11.0.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.5 2011/04/21 01:20:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.6 2011/04/22 05:56:08 dirtyepic Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -129,6 +129,7 @@ src_install() {
 		dodir /usr/share/doc/${PF}/samples
 		cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/
 		cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/
+		rm -f "${D}"usr/share/doc/${PF}/samples/embedded/embedded
 	fi
 }
 
diff --git a/dev-python/wxpython/wxpython-2.8.12.0.ebuild b/dev-python/wxpython/wxpython-2.8.12.0.ebuild
index 05dceba482af..93c2fb1dc393 100644
--- a/dev-python/wxpython/wxpython-2.8.12.0.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.0.ebuild,v 1.2 2011/04/21 01:20:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.0.ebuild,v 1.3 2011/04/22 05:56:08 dirtyepic Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -84,7 +84,7 @@ src_compile() {
 }
 
 src_install() {
-	local mypyconf
+	local docdir mypyconf
 
 	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
 	use opengl \
@@ -117,18 +117,22 @@ src_install() {
 	newins "${S}"/wx/py/PyCrust_32.png PyCrust.png
 	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
 
+	docdir=${D}usr/share/doc/${PF}
+
 	if use doc; then
 		dodir /usr/share/doc/${PF}/docs
-		cp -R "${DOC_S}"/docs/* "${D}"usr/share/doc/${PF}/docs/
+		cp -R "${DOC_S}"/docs/* "${docdir}"/docs/
 		# For some reason newer API docs aren't available so use 2.8.9.2's
-		cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${D}"usr/share/doc/${PF}/docs/
+		cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${docdir}"/docs/
 	fi
 
 	if use examples; then
 		dodir /usr/share/doc/${PF}/demo
+		cp -R "${DOC_S}"/demo/* "${docdir}"/demo
 		dodir /usr/share/doc/${PF}/samples
-		cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/
-		cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/
+		cp -R "${DOC_S}"/samples/* "${docdir}"/samples
+		[[ -e ${docdir}/samples/embedded/embedded ]] \
+			&& rm -f "${docdir}"/samples/embedded/embedded
 	fi
 }