Added python support, 357397, thanks Martin for the Patch

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

4 files changed, 79 insertions, 6 deletions

diff --git a/dev-libs/tre/ChangeLog b/dev-libs/tre/ChangeLog
index 0fad73209dbb..826e4dca742b 100644
--- a/dev-libs/tre/ChangeLog
+++ b/dev-libs/tre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/tre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tre/ChangeLog,v 1.49 2011/01/29 17:38:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tre/ChangeLog,v 1.50 2011/03/04 17:37:54 jlec Exp $
+
+  04 Mar 2011; Justin Lecher <jlec@gentoo.org> +files/0.8.0-python.patch,
+  tre-0.8.0.ebuild:
+  Added python support, 357397, thanks Martin for the Patch
 
   29 Jan 2011; Raúl Porcel <armin76@gentoo.org> tre-0.8.0.ebuild:
   alpha/ia64/sparc stable wrt #350839
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index fc5d0b658551..b4db6c4fff45 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.8.0-python.patch 1168 RMD160 73453c97aa6cccaac220d377abe232999b39b043 SHA1 a3e921e0e1f00ff8874fbff9b22afd8c6a67da0d SHA256 acb6cd7f36f37828c829efc8818f1484dc69ddbbd98a8b31ae3003ea425d94c7
 DIST tre-0.7.5.tar.bz2 396346 RMD160 240c106caef50097a9bfbad94f5cc002a9b4b497 SHA1 16b860479341f3179ef987765aacda9e2803f7bb SHA256 030f25e6e4c1714df013105494bc5e24b3e0acc65887158a52a03efd8e0759aa
 DIST tre-0.8.0.tar.bz2 380714 RMD160 8031cc0c421dd0f473b4c98f49aef9805fa65b64 SHA1 a41692e64b40ebae3cffe83931ddbf8420a10ae3 SHA256 8dc642c2cde02b2dac6802cdbe2cda201daf79c4ebcbb3ea133915edf1636658
 EBUILD tre-0.7.5.ebuild 1246 RMD160 3d09de2a1f7eac7d1c18321512cbac86b62a27d2 SHA1 37305c84758e7f44bbab31e976a6aee7f2ced4c5 SHA256 8ffdee595b0383efdbffac81bd152c6acb87a8c59690ed789db702725e1dd4bf
-EBUILD tre-0.8.0.ebuild 1448 RMD160 eb15f3749cee89f152095afdba1b1361c6e138a1 SHA1 51328381e8ed67e649892f848e2d8cbd53ce13c7 SHA256 0945a57310a2126c68824bb512c3b07f91a8427a6dd3e62626f63ebfde53f261
-MISC ChangeLog 6283 RMD160 f5d1951201e1d4dadd0d6a8403acd29017aca57a SHA1 5a949d740f162493a7c393b6fa81470028c37134 SHA256 1a32757eff9127d3a6eef0d4ebf724dcd7899ef6d9f62cb68dbb3141e179f9b5
+EBUILD tre-0.8.0.ebuild 1785 RMD160 4bf54df999c4554c8849771e5f1262d2e3caa2f7 SHA1 8435a8102b30781cacc434af893f50bfc4adf240 SHA256 f87e48fcb834c5b8f771391e3b0bf8baf4057d5afc27c6561ead27e18bdcc9b1
+MISC ChangeLog 6435 RMD160 8ca01808bbbe48e8e10e81f5a0719f0418047729 SHA1 b95333514fbcd4c1fbceaa6e8550066ba83fa860 SHA256 e1d4d164c71335e76ec3e134e017343e0c96a173636413c2aae3878cac7979ee
 MISC metadata.xml 166 RMD160 122e578c52fe3661ff8b8f1f574d8651916e3bf5 SHA1 5eb96c1efa4708676adcd6cad061b22caf9bdfe5 SHA256 064eb80cc86913e2a47d1088f1b0ebd5b64b5dab1c73d38b8501cd77891cfbbf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1xI3gACgkQgAnW8HDreRZtcwCgjuHbwvL+/VHiy/K4eskC0hMv
+ls0AoIAp1x5/ZPUHczal0w2ulT5Kg/3X
+=GOZj
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/tre/files/0.8.0-python.patch b/dev-libs/tre/files/0.8.0-python.patch
new file mode 100644
index 000000000000..f290e0bf5783
--- /dev/null
+++ b/dev-libs/tre/files/0.8.0-python.patch
@@ -0,0 +1,39 @@
+diff --git a/python/setup.py b/python/setup.py
+index b420a4c..b1bca6b 100644
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -10,7 +10,8 @@ import shutil
+ 
+ version = "0.8.0"
+ data_files = []
+-include_dirs = ["../lib"]
++include_dirs = ["lib"]
++library_dirs = ["lib/.libs"]
+ libraries = ["tre"]
+ 
+ if sys.platform == "win32":
+@@ -28,9 +29,10 @@ setup(name = "tre",
+       url = "http://laurikari.net/tre/",
+       data_files = data_files,
+       ext_modules = [Extension("tre",
+-                               sources = ["tre-python.c"],
++                               sources = ["python/tre-python.c"],
+                                define_macros = [("HAVE_CONFIG_H", None)],
+                                include_dirs = include_dirs,
++			       library_dirs = library_dirs,
+                                libraries = libraries
+                                ),
+                      ],
+diff --git a/python/tre-python.c b/python/tre-python.c
+index bbb24ed..2e35e3a 100644
+--- a/python/tre-python.c
++++ b/python/tre-python.c
+@@ -13,7 +13,7 @@
+ #include "Python.h"
+ #include "structmember.h"
+ 
+-#include <tre/tre.h>
++#include <tre.h>
+ 
+ #define	TRE_MODULE	"tre"
+ 
diff --git a/dev-libs/tre/tre-0.8.0.ebuild b/dev-libs/tre/tre-0.8.0.ebuild
index 73a55a06bf4d..88d24179725c 100644
--- a/dev-libs/tre/tre-0.8.0.ebuild
+++ b/dev-libs/tre/tre-0.8.0.ebuild
@@ -1,17 +1,23 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tre/tre-0.8.0.ebuild,v 1.10 2011/01/29 17:38:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tre/tre-0.8.0.ebuild,v 1.11 2011/03/04 17:37:54 jlec Exp $
 
 EAPI=2
 
-DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library."
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
+
+DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library"
 HOMEPAGE="http://laurikari.net/tre/"
 SRC_URI="http://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="nls static-libs"
+IUSE="nls python static-libs"
 
 RDEPEND="
 	!app-misc/glimpse
@@ -20,6 +26,13 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+DISTUTILS_SETUP_FILES=("python/setup.py")
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-python.patch
+	python_copy_sources python
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
@@ -29,6 +42,11 @@ src_configure() {
 		$(use_enable static-libs static)
 }
 
+src_compile() {
+	emake || die
+	use python && distutils_src_compile
+}
+
 src_test() {
 	if $(locale -a | grep -iq en_US.iso88591); then
 	emake -j1 \
@@ -44,6 +62,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
 	dohtml doc/*.{css,html} || die
+	use python && distutils_src_install
 }
 
 pkg_postinst() {