remove automagic dependency on libffi, bug #198875

Package-Manager: portage-2.1.4_rc11

5 files changed, 155 insertions, 5 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index e7b908206ec7..200e90345900 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.29 2007/11/27 03:39:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.30 2007/12/27 18:04:50 eva Exp $
+
+*pygobject-2.14.0-r1 (27 Dec 2007)
+
+  27 Dec 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/pygobject-2.14.0-libffi-magic.patch, +pygobject-2.14.0-r1.ebuild:
+  remove automagic dependency on libffi, bug #198875
 
   27 Nov 2007; Jeroen Roovers <jer@gentoo.org> pygobject-2.14.0.ebuild:
   Stable for HPPA (bug #199322).
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 7aa8cf22abab..743a2d3b3b94 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,17 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pygobject-2.14.0-libffi-magic.patch 1445 RMD160 e71a2caba2a61803d115420631f7cd63cef7197e SHA1 0dbb6ce61fae2f4e53b7a4131918a99687f0a4be SHA256 229b1b62a1e5ac2c86a17683d5e3c64fa0aaf6ad0e54ed384d0f7a8084b182eb
+MD5 9c5ed772cf395f29a8fcac2e588a00e3 files/pygobject-2.14.0-libffi-magic.patch 1445
+RMD160 e71a2caba2a61803d115420631f7cd63cef7197e files/pygobject-2.14.0-libffi-magic.patch 1445
+SHA256 229b1b62a1e5ac2c86a17683d5e3c64fa0aaf6ad0e54ed384d0f7a8084b182eb files/pygobject-2.14.0-libffi-magic.patch 1445
 DIST pygobject-2.12.3.tar.bz2 339088 RMD160 b5a8a63235025901fb6a41fae170ca5c22ae4ec9 SHA1 8679463abeee085b2dd2db5b6f2a1cf78ca71ad6 SHA256 efa81e0281668988b8cc2af9d0546befa4365662f1ebec37e0c7c863e969da41
 DIST pygobject-2.14.0.tar.bz2 360630 RMD160 71702329535680a813a36e05823d1968cb453b25 SHA1 f6867330c2a2d70ddb81807823e7515f55ddda23 SHA256 3a5919703f71c2d7059d02f03dc6566cbe86c6efb09a16730b7cdb4b0fbef9e8
 EBUILD pygobject-2.12.3.ebuild 2023 RMD160 2ef6377634d350c91d280f5ce40ec906ff6c226f SHA1 3348b03dbea99dae00fcce6aa23bc6ff95fa1800 SHA256 0d3eb1c1f4123fe6c4c0cbf153ef3b318d0f104fd0b4273f2944d2160e5084aa
 MD5 6ee8f0e892f80f642e123879649e95b5 pygobject-2.12.3.ebuild 2023
 RMD160 2ef6377634d350c91d280f5ce40ec906ff6c226f pygobject-2.12.3.ebuild 2023
 SHA256 0d3eb1c1f4123fe6c4c0cbf153ef3b318d0f104fd0b4273f2944d2160e5084aa pygobject-2.12.3.ebuild 2023
+EBUILD pygobject-2.14.0-r1.ebuild 2635 RMD160 c4f26c075f67cd44e0e3d536df712d4fa9d87fec SHA1 6b14e18a076feca69e028900f396c2afb3aa3c6f SHA256 8da50aa62ef62494e0a2e7b108d2edc3a73dfffdf0ac70446f95ccced3786627
+MD5 6abb6bea8601e4f81b5528b53b0f6f63 pygobject-2.14.0-r1.ebuild 2635
+RMD160 c4f26c075f67cd44e0e3d536df712d4fa9d87fec pygobject-2.14.0-r1.ebuild 2635
+SHA256 8da50aa62ef62494e0a2e7b108d2edc3a73dfffdf0ac70446f95ccced3786627 pygobject-2.14.0-r1.ebuild 2635
 EBUILD pygobject-2.14.0.ebuild 2404 RMD160 e10554c9c98ebf00ad7c29b70acd422e0916b7c3 SHA1 2b5f5c31095911358e1195e83bdf692129f518ac SHA256 7a4a6c6737b7e701f2f6ae6f219de7f81b4eb15800bc091c8083dd317559f34b
 MD5 e24e04ee8b02e9fec41e1a4882eb31d5 pygobject-2.14.0.ebuild 2404
 RMD160 e10554c9c98ebf00ad7c29b70acd422e0916b7c3 pygobject-2.14.0.ebuild 2404
 SHA256 7a4a6c6737b7e701f2f6ae6f219de7f81b4eb15800bc091c8083dd317559f34b pygobject-2.14.0.ebuild 2404
-MISC ChangeLog 3746 RMD160 ce887766c0f46d884a0fb605a36a618f6612d6fd SHA1 35d1211afc79a8539af203008666988aef7b12a6 SHA256 75c4023098d9835c73e3f78e0b43f6c928940b45fceb802139ab2b09abb98745
-MD5 6bf4a40dfa48a5673cf213ac463bc492 ChangeLog 3746
-RMD160 ce887766c0f46d884a0fb605a36a618f6612d6fd ChangeLog 3746
-SHA256 75c4023098d9835c73e3f78e0b43f6c928940b45fceb802139ab2b09abb98745 ChangeLog 3746
+MISC ChangeLog 3965 RMD160 7c35655f5b3834a10dda04a14f25cfe641cba5b5 SHA1 952d5d7755afe26ad219083107aa14e28e514bd7 SHA256 9074a036f12c425e47e6d79ac777f2197b713d0a9bd0c3ffdcdf1bde629cf5d0
+MD5 f3d1df170157977b5ff99cbbea050178 ChangeLog 3965
+RMD160 7c35655f5b3834a10dda04a14f25cfe641cba5b5 ChangeLog 3965
+SHA256 9074a036f12c425e47e6d79ac777f2197b713d0a9bd0c3ffdcdf1bde629cf5d0 ChangeLog 3965
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -22,3 +33,13 @@ SHA256 131b6870214578bc9fdd86acb706467d5a25e2e4f9c1011ea333d1bff708571e files/di
 MD5 533048cbfb61307370e6f5c4f90e6a6e files/digest-pygobject-2.14.0 253
 RMD160 f8545ced06ee2649e8fc77ee7613a826aac606aa files/digest-pygobject-2.14.0 253
 SHA256 2363df011bfba9221a19bd379514e3290179bd963a5010fecd86506e14a25f6f files/digest-pygobject-2.14.0 253
+MD5 533048cbfb61307370e6f5c4f90e6a6e files/digest-pygobject-2.14.0-r1 253
+RMD160 f8545ced06ee2649e8fc77ee7613a826aac606aa files/digest-pygobject-2.14.0-r1 253
+SHA256 2363df011bfba9221a19bd379514e3290179bd963a5010fecd86506e14a25f6f files/digest-pygobject-2.14.0-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHc+mR1fmVwcYIWAYRAkygAKCd3uJBOgnnChGV8QDVz9dFMW4GTQCgh15Z
+KyLmV6uiDWofpqRf9Y1moGc=
+=RwYC
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/files/digest-pygobject-2.14.0-r1 b/dev-python/pygobject/files/digest-pygobject-2.14.0-r1
new file mode 100644
index 000000000000..0192ff4bbc8b
--- /dev/null
+++ b/dev-python/pygobject/files/digest-pygobject-2.14.0-r1
@@ -0,0 +1,3 @@
+MD5 de781a21f483c941a73009a9f68f150e pygobject-2.14.0.tar.bz2 360630
+RMD160 71702329535680a813a36e05823d1968cb453b25 pygobject-2.14.0.tar.bz2 360630
+SHA256 3a5919703f71c2d7059d02f03dc6566cbe86c6efb09a16730b7cdb4b0fbef9e8 pygobject-2.14.0.tar.bz2 360630
diff --git a/dev-python/pygobject/files/pygobject-2.14.0-libffi-magic.patch b/dev-python/pygobject/files/pygobject-2.14.0-libffi-magic.patch
new file mode 100644
index 000000000000..9c5554739eac
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.14.0-libffi-magic.patch
@@ -0,0 +1,40 @@
+--- pygobject-2.14.0/configure.ac	2007/11/12 00:09:09	1.1
++++ pygobject-2.14.0/configure.ac	2007/11/12 00:22:35
+@@ -129,10 +129,33 @@ AC_SUBST([pygobject_CODEGEN_DEFINES])
+ 
+ dnl libffi
+ AC_MSG_CHECKING(for ffi.h)
+-AC_TRY_CPP([#include <ffi.h>], pygobject_ffi_h=yes, pygobject_ffi_h=no)
+-if test $pygobject_ffi_h = yes; then
+-   AC_DEFINE(HAVE_FFI_H,1,[Have ffi.h include file])
+-   FFI_LIBS="-lffi"
++AC_ARG_WITH(libffi,
++  AC_HELP_STRING([--without-libffi], [Disable libffi support]),
++  with_libffi=$withval,
++  with_libffi=auto)
++if test x"$with_libffi" = xno ; then
++  pygobject_ffi_h=disabled
++else
++  AC_TRY_CPP([#include <ffi.h>], pygobject_ffi_h=yes, pygobject_ffi_h=no)
++  if test $pygobject_ffi_h = yes; then
++    AC_DEFINE(HAVE_FFI_H,1,[Have ffi.h include file])
++    save_LIBS=$LIBS
++    if test x"$with_libffi" = xyes || test x"$with_libffi" = xauto; then
++      other_LIBS=
++    else
++      other_LIBS=$with_libffi
++    fi
++    AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS)
++    if test x$"ac_cv_search_ffi_call" = x"none required" ; then
++      FFI_LIBS=$other_LIBS
++    else
++      FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
++    fi
++    LIBS=$save_LIBS
++  fi
++fi
++if test x"$with_libffi" = xyes && test x"$pygobject_ffi_h" != xyes ; then
++  AC_MSG_ERROR([libffi requested, but ffi.h not found])
+ fi
+ AC_MSG_RESULT([$pygobject_ffi_h])
+ AM_CONDITIONAL(HAVE_LIBFFI, test "$pygobject_ffi_h" = "yes")
diff --git a/dev-python/pygobject/pygobject-2.14.0-r1.ebuild b/dev-python/pygobject/pygobject-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..65741aa645f0
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.14.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.14.0-r1.ebuild,v 1.1 2007/12/27 18:04:50 eva Exp $
+
+WANT_AUTOMAKE=1.8
+inherit gnome2 python autotools
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples"
+
+# glib higher dep than in configure.in comes from a runtime version check and ensures that
+# timeout_add_seconds is available for any packages that depend on pygobject and use it
+# python high dep for a fixed python-config, as aclocal.m4/configure in the tarball requires it to function properly
+RDEPEND=">=dev-lang/python-2.4.4-r5
+	>=dev-libs/glib-2.13.5
+	!<dev-python/pygtk-2.9"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	# activate libffi when bug #199850 is solved
+	G2CONF="${G2CONF} $(use_enable doc docs) --without-libffi"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix bug #147285 - Robin H. Johnson <robbat2@gentoo.org>
+	# this is caused by upstream's automake-1.8 lacking some Gentoo-specific
+	# patches (for tmpfs amongst other things). Upstreams hit by this should
+	# move to newer automake versions ideally.
+	# eautomake
+
+	# fix bug #198875 and bug #194632
+	epatch "${FILESDIR}/${P}-libffi-magic.patch"
+
+	# uncomment above eautomake when eautoreconf isn't needed anymore
+	cp aclocal.m4 old.m4
+	AT_M4DIR="." eautoreconf
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples
+	fi
+
+	python_version
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py-2.0
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth-2.0
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	python_mod_compile "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}