Install all required files (bug #358027).

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

4 files changed, 64 insertions, 8 deletions

diff --git a/dev-python/pycxx/ChangeLog b/dev-python/pycxx/ChangeLog
index 621d13374e15..f86e21ebfc1d 100644
--- a/dev-python/pycxx/ChangeLog
+++ b/dev-python/pycxx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pycxx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/ChangeLog,v 1.25 2011/03/07 23:00:39 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/ChangeLog,v 1.26 2011/03/09 13:56:40 arfrever Exp $
+
+*pycxx-6.2.3-r1 (09 Mar 2011)
+
+  09 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pycxx-6.2.3.ebuild, +pycxx-6.2.3-r1.ebuild,
+  files/pycxx-6.2.3-installation.patch:
+  Install all required files (bug #358027).
 
 *pycxx-6.2.3 (07 Mar 2011)
 
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index 4aa55da74861..85ca625814b7 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -2,13 +2,13 @@ AUX pycxx-6.1.0-C_compatible_headers.patch 1213 RMD160 a12fc8aef17e1ddac6cb653a4
 AUX pycxx-6.1.0-python-3.patch 398 RMD160 0610322f137c6a587b581b9681fe0712ebdacdb9 SHA1 0a98ac0686f363d3f44d1235ce6f6ecd3e7e70e2 SHA256 6d23ce38343e86c62edf56e08837a199bd71f2b686446e3399be5ac4b7dd2ed4
 AUX pycxx-6.1.0-setup.py.patch 1390 RMD160 7fbf6530f49bb97614fdc69c3a8e751e6b602526 SHA1 2cfed58ab995cf34bc29f74fc11774e3f9613c1b SHA256 7571d6c99d464bfb92a8eaeafec59610bb50fcea147b71722ff94fd90e3a4aa9
 AUX pycxx-6.2.1-python-3.1.3.patch 2572 RMD160 130ce76aad330389ccccc0473fc5b2acbf28f03f SHA1 810c8a3dd8929eaef42f5c7901b188396e4222a1 SHA256 ad459013befc38a5166d635822b08b8f7979c2b55719360fec4d83fe02bd62bc
-AUX pycxx-6.2.3-installation.patch 801 RMD160 d1c584bf19606479febde88ab1c309ff498ba479 SHA1 5b2cf1e813909b43891efdc084673d34c64f537a SHA256 f23607a5123bb51757b4374c9e7732c2fc0ccd63a2996526ba93afc2b815ba57
+AUX pycxx-6.2.3-installation.patch 1248 RMD160 ec0d6925e21af0c1e2125a1f90da50bb09040202 SHA1 0c47e86288c3134377aa8cd17966c3ac8031ddc8 SHA256 f6c47b1d613b01511e55cefbc0e0564c402374fc0a4340848f712011b416f7de
 AUX pycxx-6.2.3-python-3.patch 1063 RMD160 23aed53bf8e04df6171306c2e398b6c0676b854e SHA1 7177044874e96d270c10ae3313cf61e1f02c9d8a SHA256 3a06d5841d2f8e1dfa65b7d7197e8d72df652688956bc22d724aa89064612792
 DIST pycxx-6.2.1.tar.gz 144162 RMD160 5549ec039b66d9c20d5fce8e16e38c81bedfbc88 SHA1 ec260197805c19e7cd9af7a371b5c4585554e566 SHA256 2f6c8b49a29aeece56c226d419998dca8f99af4d24b4092fa09f4878c72135a5
 DIST pycxx-6.2.2.tar.gz 144438 RMD160 4613b0073250b6f248e535413f38dd18ead449ec SHA1 52f8136026d1a5ec638dfb2d5ce03ba70f9b1f68 SHA256 8a0c9c41885ab7579a807c2709e53528a53c2426a048840dad43c093b2994138
 DIST pycxx-6.2.3.tar.gz 140787 RMD160 8f39efc0dc86f75a394172be232b10f5aead1368 SHA1 12245dd18e3bd1d5dc4190d01eba6dd31ff39c07 SHA256 74b89aec29f3fc40ce08b402f05bb6955f6546a796d2aeb3193737a268f6a4f2
 EBUILD pycxx-6.2.1-r1.ebuild 1195 RMD160 dfbdedf54ca2c094d325c96a116a6e83e67695ad SHA1 48862b57eead261b3e7bb9af5a2ba55857839e10 SHA256 f255b6523c7402ffeb6264e8b0ab5501f112436a50cc98459bbd0de83c1b73f5
 EBUILD pycxx-6.2.2.ebuild 1151 RMD160 b614ce9584e77fcf17462dbdd8ba6a3a4b1cd534 SHA1 22f9c2552c9082fc786b8383c441898ad29e13c6 SHA256 0cd901cffd306f725c855bbc6c8db93043268ae99716b2a0641b627bed98cea1
-EBUILD pycxx-6.2.3.ebuild 1142 RMD160 bf986c2b0796ad3f13908d914f76984055c62ea0 SHA1 c333990b12df6bf0c503b1f9fde8fc8e84276c4d SHA256 f2681eca689458f2cedb69ad8d4ed691c6f9cdadde5aa1faa40277156c849797
-MISC ChangeLog 3406 RMD160 00b14f9391fae71a9efb0d69f1c84ac3041af225 SHA1 a39cbacd4111bc7f2b0b88de703734fc22f03d62 SHA256 e9cd51ade0f8b92e8dc884f08ed7ae2d0cbb36a3ecfe0ede0159cae4f1f521f2
+EBUILD pycxx-6.2.3-r1.ebuild 1145 RMD160 f17bf846edd6fcad1922763d2084c03c92e97914 SHA1 a65e4cb75ac2350196828fa3b5ebfe665520846f SHA256 32548ae0553f129f4f72f71bc437412576da7a402d9f6d8c6e8c02119d43c2c8
+MISC ChangeLog 3642 RMD160 e4c32c14ac4f3667e1a98a2ad4be9e9dc140f5e6 SHA1 9658dc56edcdb52b58bd1a1273e0d45d035d4f8f SHA256 3038b2f5d3c1c5813cb05e22ad448b00ddb417b63551b0e2978dffc57d615806
 MISC metadata.xml 556 RMD160 58bf795f79850d5844f4c324bb9b01e5a7f3cfe6 SHA1 240a0b1d1f74321c3eb5eab5676dd0eafe824911 SHA256 cb33179b683664b2fdfce0dbc687c7816bc2d15417aeb7025db6c50063cdc3ab
diff --git a/dev-python/pycxx/files/pycxx-6.2.3-installation.patch b/dev-python/pycxx/files/pycxx-6.2.3-installation.patch
index cd7523ccdecd..5f6bfa74f4be 100644
--- a/dev-python/pycxx/files/pycxx-6.2.3-installation.patch
+++ b/dev-python/pycxx/files/pycxx-6.2.3-installation.patch
@@ -1,6 +1,6 @@
 --- setup.py
 +++ setup.py
-@@ -3,10 +3,12 @@
+@@ -3,10 +3,18 @@
  from distutils.command.install import install
  from distutils.core import setup
  
@@ -9,11 +9,17 @@
 -sources = (glob( os.path.join( "Src", "*.cxx" ) )
 -          +glob( os.path.join( "Src", "*.c" ) ))
 +headers = (glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.hxx" ) )
-+          +glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.h" ) )
-+          +[os.path.join( "CXX", "Version.hxx" )]
-+          +[os.path.join( "CXX", "WrapPython.h" )])
++          +glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.h" ) ))
++headers += [header for header in
++            glob( os.path.join( "CXX", "*.hxx" ) ) +
++            glob( os.path.join( "CXX", "*.h" ) )
++            if os.path.sep.join((os.path.split(header)[0], "Python%s" % sys.version_info[0], os.path.split(header)[1])) not in headers]
 +sources = (glob( os.path.join( "Src", "Python%s" % sys.version_info[0], "*.cxx" ) )
 +          +glob( os.path.join( "Src", "Python%s" % sys.version_info[0], "*.c" ) ))
++sources += [source for source in
++            glob( os.path.join( "Src", "*.cxx" ) ) +
++            glob( os.path.join( "Src", "*.c" ) )
++            if os.path.sep.join((os.path.split(source)[0], "Python%s" % sys.version_info[0], os.path.split(source)[1])) not in sources]
  
  
  class my_install (install):
diff --git a/dev-python/pycxx/pycxx-6.2.3-r1.ebuild b/dev-python/pycxx/pycxx-6.2.3-r1.ebuild
new file mode 100644
index 000000000000..eed07172336c
--- /dev/null
+++ b/dev-python/pycxx/pycxx-6.2.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.3-r1.ebuild,v 1.1 2011/03/09 13:56:40 arfrever Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit eutils distutils
+
+DESCRIPTION="Set of facilities to extend Python with C++"
+HOMEPAGE="http://cxx.sourceforge.net"
+SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="doc examples"
+
+PYTHON_MODNAME="CXX"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-3.patch"
+	epatch "${FILESDIR}/${P}-installation.patch"
+	epatch "${FILESDIR}/${PN}-6.1.0-C_compatible_headers.patch"
+
+	sed -e "/^#include/s:/Python[23]/:/:" -i CXX/*/*.hxx || die "sed failed"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r Doc/ || die "dohtml failed"
+	fi
+
+	if use examples; then
+		docinto examples/python-2
+		dodoc Demo/Python2/* || die "dodoc failed"
+		docinto examples/python-3
+		dodoc Demo/Python3/* || die "dodoc failed"
+	fi
+}