Set SUPPORT_PYTHON_ABIS, don't build static version of Python module (bug #312187).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-libs/libgamin/ChangeLog b/dev-libs/libgamin/ChangeLog
index f8c3ed0007dfa95b7060ebdb9ae81720b50fe0a4..ca1f9dfc76422ae8fb31bc3db80e632146f55ab4 100644 (file)
--- a/dev-libs/libgamin/ChangeLog
+++ b/dev-libs/libgamin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgamin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.24 2009/09/25 10:51:18 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.25 2010/06/16 18:43:43 arfrever Exp $
+
+  16 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  libgamin-0.1.10-r2.ebuild,
+  +files/libgamin-0.1.10-disable_python_static_library.patch:
+  Set SUPPORT_PYTHON_ABIS, don't build static version of Python module (bug #312187).
 
   25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/gamin-0.1.9-freebsd.patch, libgamin-0.1.10-r1.ebuild,

diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 74ec0c1b34ee7eb444a6dce7f97129c755743d6a..3c585ff2fc911ccf8ec9208b7a80d61efe95b4f3 100644 (file)
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -1,7 +1,8 @@
 AUX libgamin-0.1.10-compilewarnings.patch 526 RMD160 b460c5b724a36934c5e4a411a3d5e6d5a8f820ef SHA1 8358f05948018bfd46b752f76006f5272f5f9385 SHA256 dfca2bee08ba14c873a6bcd732359dd7e3a9372d6d9fb82378194d7a73a30e68
+AUX libgamin-0.1.10-disable_python_static_library.patch 340 RMD160 9e479b3483d658efdeff40f92e3a405568467623 SHA1 c7378e36fe7a15ba92fbef45c57515e922d3bb52 SHA256 460306119bc6be6fd19d173eadfa28493fc72e90fceaf3ee49b50fee50a4f5d1
 AUX libgamin-0.1.10-noinst-lib.patch 2207 RMD160 f0d2479f5aec3ef8852a36214c168ef560de3594 SHA1 544895f7345413c5314b4d5892492e7b27c8eb6b SHA256 e19ede71d259fbe5888c06635441365a48687034b24c5f15edd808a7cbd9cdc7
 DIST gamin-0.1.10.tar.gz 653392 RMD160 fb6ba5ec2d2f49afacf10dda4095f02f5930d686 SHA1 f4c6b9fe87757552ef58fef4abef9e42cd3142ac SHA256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 RMD160 9f53abfcb9e785e9408cb8f1d35ff36fb739d878 SHA1 3d276802bbab47885dfcba0bbe6422711c84e676 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723
-EBUILD libgamin-0.1.10-r2.ebuild 2135 RMD160 83fd4becc5af78831c35e46f21f056a604fc8a68 SHA1 9ee4aacdbf61c109572dbf1baf60585182ed1efd SHA256 7b2e47c55b941d6221df3c2ced76f187bf2549909cb5b6232119c39100abb6c5
-MISC ChangeLog 3353 RMD160 96d81b92c008c2c2687b8f442c52de2bfbf4dbda SHA1 781953b97ae03ca5729b7557b762c25c69a1a8a2 SHA256 39447d4d2d4ca015b4b81c925307ccc4a2c6ea9f2d5c98d50012ae5debe0f069
+EBUILD libgamin-0.1.10-r2.ebuild 2990 RMD160 ccbc0a4c663ff83acb342892da58c1b91bd6d60b SHA1 d51e84ae1d65e5ca8ea3fc2046ae0666477d7476 SHA256 62719902d63e5654614670041aaf52b2e94f214deb1351c572feb81e75f192ac
+MISC ChangeLog 3603 RMD160 60e852119e4e442416cf465f94b3543478c6e3c2 SHA1 6aeea26314151c7851d0111500acf624b2bde24e SHA256 d48808b2de083f8291f3bcdbb6f24bfdc905d137732eb70f66fd3054c5ff7967
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97

diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch b/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch
new file mode 100644 (file)
index 0000000..562fc07
--- /dev/null
+++ b/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch
@@ -0,0 +1,13 @@
+--- python/Makefile.am
++++ python/Makefile.am
+@@ -10,8 +10,9 @@
+ python_LTLIBRARIES = _gamin.la
+ 
+ _gamin_la_SOURCES = gamin.c
++_gamin_la_CFLAGS = -shared
+ _gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la
+-_gamin_la_LDFLAGS = -module -avoid-version
++_gamin_la_LDFLAGS = -module -avoid-version -shared
+ 
+ python_PYTHON = gamin.py
+ 

diff --git a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
index 8236e81d0a2f1c2af58895fcc0a53ab2406b0aca..20222730681f0b96d5ad0434dbd5039d2bbc9246 100644 (file)
--- a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.11 2009/09/25 10:51:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.12 2010/06/16 18:43:43 arfrever Exp $
 
 EAPI="2"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit autotools eutils flag-o-matic libtool python
 
@@ -21,8 +24,7 @@ IUSE="debug kernel_linux python"
 
 RESTRICT="test" # need gam-server
 
-RDEPEND="python? ( virtual/python )
-       !app-admin/fam
+RDEPEND="!app-admin/fam
        !<app-admin/gamin-0.1.10"
 
 DEPEND="${RDEPEND}
@@ -30,6 +32,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+       if use python; then
+               python_pkg_setup
+       fi
+}
+
 src_prepare() {
        # Fix QA warnings, bug #257281, upstream #466791
        epatch "${FILESDIR}/${P}-compilewarnings.patch"
@@ -40,6 +48,12 @@ src_prepare() {
        # Fix collision problem due to intermediate library, upstream bug #530635
        epatch "${FILESDIR}/${P}-noinst-lib.patch"
 
+       # Build only shared version of Python module.
+       epatch "${FILESDIR}/${P}-disable_python_static_library.patch"
+
+       # Python bindings are built/installed manually.
+       sed -e "/SUBDIRS += python/d" -i Makefile.am
+
        # autoconf is required as the user-cflags patch modifies configure.in
        # however, elibtoolize is also required, so when the above patch is
        # removed, replace the following call with a call to elibtoolize
@@ -58,20 +72,50 @@ src_configure() {
                $(use_with python)
 }
 
+src_compile() {
+       default
+
+       if use python; then
+               python_copy_sources python
+
+               building() {
+                       emake \
+                               PYTHON_INCLUDES="$(python_get_includedir)" \
+                               PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
+                               PYTHON_VERSION="$(python_get_version)"
+               }
+               python_execute_function -s --source-dir python building
+       fi
+}
+
 src_install() {
        emake DESTDIR="${D}" install || die "installation failed"
 
+       if use python; then
+               installation() {
+                       emake \
+                               DESTDIR="${D}" \
+                               PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
+                               PYTHON_VERSION="$(python_get_version)" \
+                               install
+               }
+               python_execute_function -s --source-dir python installation
+
+               python_clean_installation_image
+       fi
+
        dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt || die "dodoc failed"
        dohtml doc/* || die "dohtml failed"
 }
 
 pkg_postinst() {
        if use python; then
-               python_version
-               python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+               python_mod_optimize gamin.py
        fi
 }
 
 pkg_postrm() {
-       python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
+       if use python; then
+               python_mod_cleanup gamin.py
+       fi
 }