diff options
author | 2011-02-26 16:49:18 +0000 | |
---|---|---|
committer | 2011-02-26 16:49:18 +0000 | |
commit | a4db997a11f0113bf6b84433060233b60ceeef46 (patch) | |
tree | 55d0bb5c97d9a695d96b639cc4fd4f60317a89ee /gnome-extra/libgsf | |
parent | Marked ~ppc64 wrt #340455 (diff) | |
download | historical-a4db997a11f0113bf6b84433060233b60ceeef46.tar.gz historical-a4db997a11f0113bf6b84433060233b60ceeef46.tar.bz2 historical-a4db997a11f0113bf6b84433060233b60ceeef46.zip |
Set SUPPORT_PYTHON_ABIS (bug #313467).
Package-Manager: portage-2.2.0_alpha25_p8/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra/libgsf')
-rw-r--r-- | gnome-extra/libgsf/ChangeLog | 6 | ||||
-rw-r--r-- | gnome-extra/libgsf/Manifest | 14 | ||||
-rw-r--r-- | gnome-extra/libgsf/libgsf-1.14.19.ebuild | 56 |
3 files changed, 58 insertions, 18 deletions
diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog index 3ef36e7d8d62..b4ce3b6e8bbf 100644 --- a/gnome-extra/libgsf/ChangeLog +++ b/gnome-extra/libgsf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/libgsf # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.168 2011/02/24 20:29:41 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.169 2011/02/26 16:49:18 arfrever Exp $ + + 26 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + libgsf-1.14.19.ebuild: + Set SUPPORT_PYTHON_ABIS (bug #313467). 24 Feb 2011; Thomas Kahle <tomka@gentoo.org> libgsf-1.14.19.ebuild: x86 stable per bug 353436 diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest index 585590c57aef..f049e3be7928 100644 --- a/gnome-extra/libgsf/Manifest +++ b/gnome-extra/libgsf/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX libgsf-1.14.16-automake-fixes.patch 618 RMD160 6426795391ab582106f9f6c131974f57d078f432 SHA1 7e85ce7ae9d23599a88f740e2ddbd2d4b1d92acf SHA256 db89b4a2d6614c0ed233303f12340856ff5313a536a60bc89bc9e4dec6684135 AUX libgsf-1.14.16-gconf-automagic.patch 2201 RMD160 0a7f63db3fd9dd740f37de0d2cb42f6f75294a75 SHA1 4636e593872ec761b79921e9e935725541f4edb6 SHA256 9171232083d44e581918872f2eb3bf9b3571cde63b434caa9a04ff7c8b0c93f7 AUX libgsf-1.14.19-missing-declaration.patch 681 RMD160 6eb01d9991e2609dd85057017886d6267b7e3601 SHA1 8a85dcbc8f502b96ddfdd47d56c081dc395f132b SHA256 8b8ef1e0fd6d8ecc61c7ef5c2ef6967bbebbe34470d4e2dadf0aea2ec467a6bd @@ -8,13 +5,6 @@ DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff9534 DIST libgsf-1.14.18.tar.bz2 611584 RMD160 5df344f63d2c8679b486c7ffe493adc8121eef3e SHA1 149920a6949c65d3a71bead773395935b6aa03a8 SHA256 16d29e82f7eba68f919f2588ea5328973490fe6d4a7a5f160e8af89b387c9a95 DIST libgsf-1.14.19.tar.bz2 592483 RMD160 6f18ea6dd19431d5af9044aac88a39bb84e04556 SHA1 125dac2939f9ecc8041c5cb5cbf74a00fd14b6ca SHA256 8cf82ce95ef97e61bae02099d2f39e4d814747b546899b7c28a695e15391b56c EBUILD libgsf-1.14.18.ebuild 2554 RMD160 e9bf9a4c826889ad1b2028a12f722fb81a35c822 SHA1 7a3f4e33857fd6e897a0a1d48632a2d0436b8671 SHA256 481072772e56a91ae87f9b630537801ca41181d7d9a0c69b18698e5b3a3307e6 -EBUILD libgsf-1.14.19.ebuild 2628 RMD160 f3f057e22e817db7166bbcf23f9ac54c250adf4a SHA1 7aab93aa3352d1c36f4cc4c1eb7b54aeb947b877 SHA256 ab1781a3ccbf10d21ebbad44cf0069befd5e8ec5834c8fa5e4478a22c3c8fc15 -MISC ChangeLog 21325 RMD160 3ff2a69319b83347e15088ac0f36238d2ea1b875 SHA1 a346790fc06646304c35724168606b5c557cfbff SHA256 d40791cf4e99490c65289068da480fbb98d932182f94d7af04025c2a5da0bb11 +EBUILD libgsf-1.14.19.ebuild 3433 RMD160 5e9d2a9c973e9bb8699459c70488fc17be5af387 SHA1 6ac339db088387b4aaf09c68788c464960bcd47a SHA256 706e6b2afb70d056be55ef2748a2b714719d7a58827b99128d7189f9c66b86c3 +MISC ChangeLog 21468 RMD160 6d6dc7da0e47c468bea6ef5a1e089ec6cb034d38 SHA1 0af3ddf0cd25d1bf7ac16bac106bcfab7275eefe SHA256 d152f72b31b9bf8d210b3d2663fa650be93226e12078a326231da49979d7e294 MISC metadata.xml 304 RMD160 266992ac9d503bb80b31164d13d394853fb72bcc SHA1 97b443e72047a31c18a881dd95cc0034a02c6fc0 SHA256 97dcc056bc6ee681e66294ff87260cba35805a12db640f00c08b8ee3f7e96005 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk1mwB8ACgkQnZsgo/h8kNY6OgCfQngr5N7jrpJ+PN8RfuG8u2lF -6XMAoLFBHFVJGWENccRAWnCZNnKwa2AL -=GqyD ------END PGP SIGNATURE----- diff --git a/gnome-extra/libgsf/libgsf-1.14.19.ebuild b/gnome-extra/libgsf/libgsf-1.14.19.ebuild index e06826b0fff3..7165b4342360 100644 --- a/gnome-extra/libgsf/libgsf-1.14.19.ebuild +++ b/gnome-extra/libgsf/libgsf-1.14.19.ebuild @@ -1,9 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.19.ebuild,v 1.4 2011/02/24 20:29:41 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.19.ebuild,v 1.5 2011/02/26 16:49:18 arfrever Exp $ -EAPI="2" +EAPI="3" GCONF_DEBUG="no" +PYTHON_DEPEND="python? 2:2.6" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython" inherit autotools eutils gnome2 python multilib @@ -51,6 +54,10 @@ pkg_setup() { $(use_with python) $(use_with gtk gdk-pixbuf) $(use_with thumbnail gconf)" + + if use python; then + python_pkg_setup + fi } src_prepare() { @@ -68,6 +75,9 @@ src_prepare() { # Fix build with FEATURES="stricter" epatch "${FILESDIR}/${PN}-1.14.19-missing-declaration.patch" + # Python bindings are built/installed manually. + sed -e "/SUBDIRS += python/d" -i Makefile.am + intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf @@ -76,6 +86,39 @@ src_prepare() { ln -s $(type -P true) py-compile } +src_compile() { + gnome2_src_compile + + if use python; then + python_copy_sources python + + building() { + emake \ + PYTHON_INCLUDES="-I$(python_get_includedir)" \ + pyexecdir="$(python_get_sitedir)" \ + pythondir="$(python_get_sitedir)" + } + python_execute_function -s --source-dir python building + fi +} + +src_install() { + gnome2_src_install + + if use python; then + installation() { + emake \ + DESTDIR="${D}" \ + pyexecdir="$(python_get_sitedir)" \ + pythondir="$(python_get_sitedir)" \ + install + } + python_execute_function -s --source-dir python installation + + python_clean_installation_image + fi +} + pkg_preinst() { gnome2_pkg_preinst preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.1 @@ -84,9 +127,9 @@ pkg_preinst() { pkg_postinst() { gnome2_pkg_postinst + if use python; then - python_need_rebuild - python_mod_optimize $(python_get_sitedir)/gsf + python_mod_optimize gsf fi preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.1 @@ -95,5 +138,8 @@ pkg_postinst() { pkg_postrm() { gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf + + if use python; then + python_mod_cleanup gsf + fi } |