Build tests only on make check, bug #379929 by Dave Kemper and patch by Alexandre Rostovtsev.

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

4 files changed, 126 insertions, 20 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 2c5244290415..be167942addd 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gobject-introspection
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.41 2011/08/16 18:05:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.42 2011/09/12 08:59:31 pacho Exp $
+
+  12 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  gobject-introspection-0.10.8.ebuild,
+  +files/gobject-introspection-0.10.8-build-tests.patch:
+  Build tests only on make check, bug #379929 by Dave Kemper and patch by
+  Alexandre Rostovtsev.
 
   16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   gobject-introspection-0.10.8.ebuild:
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 4ede6aa42125..7aa2333cd7b2 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,24 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gobject-introspection-0.10.8-build-tests.patch 3792 RMD160 6699bbe51887e346cd205ecc4087f2c54289149a SHA1 c70bfdbe9a6b0a9981af7c3dcc52c782b08c1cb8 SHA256 00469e23dc415e284cf3240c1cc3e5ff6f63cb37dca249f0ebe56b81ced0521b
 DIST gobject-introspection-0.10.8.tar.bz2 1024874 RMD160 f542f75920ee95c067563f14215127c3ff95f304 SHA1 410268f5fd16cf0e219038c7dfe393249161b446 SHA256 5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e
-EBUILD gobject-introspection-0.10.8.ebuild 1693 RMD160 8cf10db1f0d698388f1ade5ce50b7170cbc683f7 SHA1 2414e14f8f8a6e86b9e28458dad4fc4f6f70c22c SHA256 df476cfca7b06bf78b2940e14ac50f1b7380a61aec181232d8a816d256f789d5
-MISC ChangeLog 7532 RMD160 3edc2ab1fe49bbc9957888743a461081e885460c SHA1 65b71b44953ef527ab5f763dc46fa822077b0b65 SHA256 602e290eb0621ca9d40c99fdbc9a7767587b81e5ccb821cc4064eb9034b75722
+EBUILD gobject-introspection-0.10.8.ebuild 1824 RMD160 fb8dcb6e53343b7135a9c5d12220f1753f970869 SHA1 21f75808d93dfe473eeeb30a78c13d68b144d272 SHA256 048364729cd256da879a61319d61e6d000522ca8131274041a2170a8c67f64cd
+MISC ChangeLog 7770 RMD160 9472fe43f6bb8100e6a40db13184ba7ce1c273e8 SHA1 d118f8315e2bc541a2c7e265ba287f5faeee1673 SHA256 4467b51dd9093688f29cedc2f17f9a559115d7200e53e23411bac256e27b10e9
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOSrF6AAoJEO/kOhxWD91k1nEQAIb3UV4lxXqYMT95uHISwuhr
-xJW6utjsrqwPQDG2PoQa1o1u6aD03bPV8ceKVy8rjTx1P9f3GkBdLpxZq9NJv8ht
-SVBjpxq9Mgpl3OK9l705+ZmiGJcn0u+3PoLgH0Zbsqkdo69D09MwTvNw5BVuuCzj
-6zIZUjMTZmZkBGGRlHucAxyR1tql78dXo6YWVcpVzCLmUXsK9FX60WDikuNzY9VT
-1ftF5a5B1T8KlHP0VNPqGykL9m3vRvyf+fjLdFJF1m3RS/zGyoNPF1N3SfYycQxP
-3Jwx4D3Nl4soTvDeKJW0OqD6NTAwoV/4wQEyzcP90s17z16grgba8xWe4MhhqwR9
-SDfDU+M4iPXgX1blKCxs6B05GPjaRHt/vTBbfr9IKGiC9dXsXM3xkkM3tSCC/72c
-S5oh1fw1gE0v8TTgDN71OIeKuPjvSX4ewijnIIrDQfUSnMFq5nQ8AhT0trjPEdzG
-1ipRvEBU8KaMLS1s3xeA0yPWlAP9EPw2s0guOWSMi9ciRFRFYQ5XPx700MhvxTdk
-p20IsfCwKjroKXXXqBG/yLTyHnWjJJrDFLkLbVZKirEYS/l5YNOYhg+p88aHr8yR
-Qy6gFIiESXjKjWsHEqC0oUCV3D+O4HpvuscWyu/6PsaKtgmjwOvW7bOxcYyU6afq
-rP/GLzjdRJzlhj+UoYRJ
-=e0s5
+iEYEARECAAYFAk5tyfkACgkQCaWpQKGI+9RSZgCcCBOIECaPKv3z1r/z9Is94/md
+3KQAmwR3sRUx7Sm14ZMEsQkfBKx8kEN0
+=8LnP
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-0.10.8-build-tests.patch b/dev-libs/gobject-introspection/files/gobject-introspection-0.10.8-build-tests.patch
new file mode 100644
index 000000000000..53bf485379ab
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-0.10.8-build-tests.patch
@@ -0,0 +1,104 @@
+From 3a308bb438246f7d6e87ebe2f6efeb1795fdcd1e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Mon, 22 Aug 2011 06:49:51 +0000
+Subject: tests: build tests only on make check
+
+Use automake's check_ prefix and avoid putting anything nontrivial in
+BUILT_SOURCES so that tests are build only on make check.
+
+The dummy -rpath in AM_LDFLAGS in tests/scanner/Makefile.am is needed to
+force libtool to build shared libraries for check_LTLIBRARIESS targets
+(automake builds check_LTLIBRARIES as static by default); see
+http://lists.gnu.org/archive/html/automake/2005-10/msg00107.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=657066
+---
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 20ecc17..2d395a3 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -16,16 +16,14 @@ tests_DATA =		    \
+     gimarshallingtests.c    \
+     gimarshallingtests.h
+ 
+-testlib_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la
+-testlibdir=$(prefix)/unused
+-install-testlibLTLIBRARIES: # prevent it from being installed
++check_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la
+ 
+ libeverything_1_0_la_SOURCES = everything.c
+ libgimarshallingtests_1_0_la_SOURCES = gimarshallingtests.c
+ 
+ EXTRA_DIST += gimarshallingtests.h
+ 
+-BUILT_SOURCES += everything.c everything.h Everything-1.0.gir GIMarshallingTests-1.0.gir
++BUILT_SOURCES += everything.c everything.h
+ 
+ CLEANFILES += \
+     $(BUILT_SOURCES) \
+diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
+index 268d9f9..ffc635f 100644
+--- a/tests/repository/Makefile.am
++++ b/tests/repository/Makefile.am
+@@ -2,7 +2,7 @@ AM_CFLAGS = $(GOBJECT_CFLAGS)
+ AM_LDFLAGS = -module -avoid-version
+ LIBS = $(GOBJECT_LIBS)
+ 
+-noinst_PROGRAMS = gitestrepo gitestthrows gitypelibtest
++check_PROGRAMS = gitestrepo gitestthrows gitypelibtest
+ 
+ gitestrepo_SOURCES = $(srcdir)/gitestrepo.c
+ gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
+index 6b78ee7..fc2e260 100644
+--- a/tests/scanner/Makefile.am
++++ b/tests/scanner/Makefile.am
+@@ -3,24 +3,21 @@ include $(top_srcdir)/Makefile.introspection
+ 
+ INTROSPECTION_SCANNER_ARGS += --warn-all --warn-error -I.
+ 
+-# We need to build a shared library, which can be dlopened
+-# it does not work with noinst_LTLIBRARIES
+-testlib_LTLIBRARIES = \
++check_LTLIBRARIES = \
+ 	libannotation.la \
+ 	libtestinherit.la \
+ 	libfoo.la \
+ 	libutility.la \
+ 	libgtkfrob.la
+ if HAVE_CAIRO
+-testlib_LTLIBRARIES += libregress.la
++check_LTLIBRARIES += libregress.la
+ endif
+ 
+-testlibdir = $(prefix)/unused
+-install-testlibLTLIBRARIES: # prevent it from being installed
+-
+ AM_CPPFLAGS = -I$(top_srcdir)/girepository
+ AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS)
+-AM_LDFLAGS = -avoid-version
++# -rpath needed to force libtool to build a shared library for a check_LTLIBRARIES
++# target. See http://lists.gnu.org/archive/html/automake/2005-10/msg00107.html
++AM_LDFLAGS = -rpath /unused -avoid-version
+ LIBS = $(GOBJECT_LIBS) $(GTHREAD_LIBS)
+ 
+ libannotation_la_SOURCES = $(srcdir)/annotation.c $(srcdir)/annotation.h
+@@ -49,7 +46,6 @@ CHECKGIRS = $(GIRS:.gir=.gir.check)
+ EXPECTEDGIRS = $(GIRS:.gir=-expected.gir)
+ INTROSPECTION_GIRS = $(GIRS)
+ CLEANFILES = $(TYPELIBS) $(GIRS)
+-BUILT_SOURCES = $(TYPELIBS) $(GIRS)
+ EXTRA_DIST = $(EXPECTEDGIRS)
+ 
+ Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir libregress.la
+@@ -102,7 +98,7 @@ GtkFrob_1_0_gir_FILES = $(libgtkfrob_la_SOURCES)
+ GtkFrob_1_0_gir_SCANNERFLAGS = --identifier-prefix=Gtk --symbol-prefix=gtk_frob
+ GIRS += GtkFrob-1.0.gir
+ 
+-noinst_PROGRAMS = barapp
++check_PROGRAMS = barapp
+ 
+ barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h
+ barapp_LDADD = $(top_builddir)/libgirepository-1.0.la
+--
+cgit v0.9.0.2
diff --git a/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild b/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild
index 71c466feb13b..afd24e517c60 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild,v 1.14 2011/08/16 18:05:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild,v 1.15 2011/09/12 08:59:31 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit gnome2 python libtool
+inherit gnome2 python libtool eutils autotools
 
 DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
 HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
@@ -41,15 +42,19 @@ src_prepare() {
 	# Don't pre-compile .py
 	ln -sf $(type -P true) py-compile
 
+	# tests: build tests only on make check
+	epatch "${FILESDIR}/${P}-build-tests.patch"
+	eautoreconf
+
+	# Uncomment the following once we don't need full eautoreconf
 	# Fix Darwin bundles
-	elibtoolize
+#	elibtoolize
 }
 
 src_install() {
 	gnome2_src_install
 	python_convert_shebangs 2 "${ED}"usr/bin/g-ir-scanner
 	python_convert_shebangs 2 "${ED}"usr/bin/g-ir-annotation-tool
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
 }
 
 pkg_postinst() {