Set SUPPORT_PYTHON_ABIS, don't install .a files in Python site-packages directories (bug #356601).

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

4 files changed, 94 insertions, 8 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 0738dc309e35..d93b3825e949 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/lcms
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.124 2010/12/12 10:09:25 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.125 2011/02/26 18:18:37 arfrever Exp $
+
+  26 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  lcms-1.19.ebuild, +files/lcms-1.19-disable_static_modules.patch:
+  Set SUPPORT_PYTHON_ABIS, don't install .a files in Python site-packages
+  directories (bug #356601).
 
 *lcms-2.1 (12 Dec 2010)
 
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index cbbe24694353..69ed44e0bcf9 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,8 +1,9 @@
+AUX lcms-1.19-disable_static_modules.patch 578 RMD160 258765bda276cfe1e4a73111ac094962096570ca SHA1 3d54655f2f78a506559c3ebd5a93bb80bd6cce5e SHA256 bd56a283da65a7ab262d35c890a99e8b103a3a73e50b997e404c3c0ac3ae467e
 DIST lcms-1.19.tar.gz 927752 RMD160 530615c061dccdcb64d75c6fab148dd565bb6c91 SHA1 d5b075ccffc0068015f74f78e4bc39138bcfe2d4 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
 DIST lcms2-2.0a.tar.gz 3449841 RMD160 610e7f92556757e963a3769e166b5a68cdd8629e SHA1 b9d3939764e3b3f33cb9b9f7cffd43520227db9e SHA256 6deaf78611f5978ff58aa85efc37cf070b6ffb7106486b894914c4fc548d054f
 DIST lcms2-2.1.tar.gz 3752136 RMD160 de88e912feb8f4e94e29e9d575b2867ec1b967e9 SHA1 0ce856a004068ff6e22f9f2d7b94a11b9b469bf9 SHA256 8b367bd60add7806c9aac970594dae636c24ba28dc774c00f8067644994e9c30
-EBUILD lcms-1.19.ebuild 1297 RMD160 1433ed033afda303b07fe73bc17279d5a6c46878 SHA1 4015e307cab00003f9f9faedb267896f97c3f887 SHA256 4c871d747365aae6f94fba7a6d8f40d598d64d3a101ebbdd00bbf12a52afc869
+EBUILD lcms-1.19.ebuild 2447 RMD160 f63ee9c525464258ea4a9ab792ea821865ded602 SHA1 a3c297ea5fbaecbe558143cbd68e7a78757bbae1 SHA256 a5c52ea3d29ed0a271d6cc7529c4eb7a87b4cf8163c2e400b19cb289f629c224
 EBUILD lcms-2.0a.ebuild 1187 RMD160 d85c909ca8bbf0e112d305ec954b63030af4acde SHA1 40869412a64aa3ca4c814d86b12f0a7bfa4046ee SHA256 870841cc551478bcb5f7ad41c9abbfc2ff5d23ebd3f4cc97018e666ad0b9f4fa
 EBUILD lcms-2.1.ebuild 1149 RMD160 9a9a453214ec91af8b078e7672aef9b1aa61e443 SHA1 dafc59e7f99418e74e54e0a58103a3500735914b SHA256 e70fd14bbccdbbc60b9394d685710425549bfee430ae956620104da6967db3e4
-MISC ChangeLog 14773 RMD160 73156f20859bd28e6df9324f7a13b5dc46f6155e SHA1 78be66aa0093c0d9a32b15135de0a09b9459a81c SHA256 a129f5d2827953ecc33ae65ba4dde79f2f6646349a60a75b0a16337ea4a45e6e
+MISC ChangeLog 15016 RMD160 56794b8a27e0d71cfb74e7dfbcf7f067c43f37f3 SHA1 3e29949f931f96d1060674255217befcd0623997 SHA256 ac4e083476527b9c9f26daa5b122fa14db6cbbe0e09b64583404973f5de2d2c0
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/media-libs/lcms/files/lcms-1.19-disable_static_modules.patch b/media-libs/lcms/files/lcms-1.19-disable_static_modules.patch
new file mode 100644
index 000000000000..23eeb48cc96d
--- /dev/null
+++ b/media-libs/lcms/files/lcms-1.19-disable_static_modules.patch
@@ -0,0 +1,20 @@
+--- python/Makefile.am
++++ python/Makefile.am
+@@ -22,7 +22,7 @@
+ 
+ endif
+ 
+-_lcms_la_LDFLAGS = -no-undefined -module -avoid-version \
++_lcms_la_LDFLAGS = -no-undefined -module -avoid-version -shared \
+                     -L$(LCMS_PYLIB)/config 
+ 
+ _lcms_la_LIBADD = $(top_builddir)/src/liblcms.la -lpython$(PYTHON_VERSION)
+@@ -31,7 +31,7 @@
+ 
+ _lcms_la_CPPFLAGS = -I$(PYTHON_PREFIX)/include/python$(PYTHON_VERSION) \
+ 		    -I$(LCMS_PYINCLUDE) \
+-                    $(AM_CPPFLAGS)
++                    $(AM_CPPFLAGS) -shared
+ 
+ 
+ EXTRA_DIST = lcms.py lcms.i testbed swig_lcms
diff --git a/media-libs/lcms/lcms-1.19.ebuild b/media-libs/lcms/lcms-1.19.ebuild
index 0a35abb79f4e..022888f7107e 100644
--- a/media-libs/lcms/lcms-1.19.ebuild
+++ b/media-libs/lcms/lcms-1.19.ebuild
@@ -1,9 +1,13 @@
-# 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/media-libs/lcms/lcms-1.19.ebuild,v 1.9 2010/09/28 16:19:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19.ebuild,v 1.10 2011/02/26 18:18:37 arfrever Exp $
 
-EAPI=2
-inherit libtool multilib
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit autotools eutils multilib python
 
 DESCRIPTION="A lightweight, speed optimized color management engine"
 HOMEPAGE="http://www.littlecms.com/"
@@ -20,7 +24,20 @@ RDEPEND="tiff? ( media-libs/tiff )
 DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-1.3.31 )"
 
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
 src_prepare() {
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS =/s/ python//" -i Makefile.am
+
+	epatch "${FILESDIR}/${P}-disable_static_modules.patch"
+
+	eautoreconf
+
 	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
 	if use python; then
 		cd python
@@ -38,6 +55,23 @@ src_configure() {
 		$(use_with zlib)
 }
 
+src_compile() {
+	default
+
+	if use python; then
+		python_copy_sources python
+
+		building() {
+			emake \
+				LCMS_PYEXECDIR="$(python_get_sitedir)" \
+				LCMS_PYINCLUDE="$(python_get_includedir)" \
+				LCMS_PYLIB="$(python_get_libdir)" \
+				PYTHON_VERSION="$(python_get_version)"
+		}
+		python_execute_function -s --source-dir python building
+	fi
+}
+
 src_install() {
 	emake \
 		DESTDIR="${D}" \
@@ -45,6 +79,20 @@ src_install() {
 		libdir=/usr/$(get_libdir) \
 		install || die
 
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				LCMS_PYEXECDIR="$(python_get_sitedir)" \
+				LCMS_PYLIB="$(python_get_libdir)" \
+				PYTHON_VERSION="$(python_get_version)" \
+				install
+		}
+		python_execute_function -s --source-dir python installation
+
+		python_clean_installation_image
+	fi
+
 	insinto /usr/share/lcms/profiles
 	doins testbed/*.icm
 
@@ -52,3 +100,15 @@ src_install() {
 
 	find "${D}" -name '*.la' -exec rm -f '{}' +
 }
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize lcms.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup lcms.py
+	fi
+}