Do not build test programs unless needed, bug #226257.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 45 insertions, 9 deletions

diff --git a/x11-libs/startup-notification/ChangeLog b/x11-libs/startup-notification/ChangeLog
index 7e2d99fd6107..1c49aa8fa1a7 100644
--- a/x11-libs/startup-notification/ChangeLog
+++ b/x11-libs/startup-notification/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/startup-notification
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/ChangeLog,v 1.62 2009/04/25 03:19:03 dang Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/ChangeLog,v 1.63 2009/07/26 10:38:43 eva Exp $
+
+  26 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  startup-notification-0.10.ebuild,
+  +files/startup-notification-0.10-tests.patch:
+  Do not build test programs unless needed, bug #226257.
 
 *startup-notification-0.10 (25 Apr 2009)
 
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index a95c256ac23e..c86399c0d45d 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX startup-notification-0.10-tests.patch 408 RMD160 6a2d9310b3dabd4264a65ca22be718dc7688678f SHA1 07478c3408779e115df5aea3229259cc6985725e SHA256 379caf2a12757163179d5a490c6d1fe346f70a8db4f9b9af609aba28db1b8452
 DIST startup-notification-0.10.tar.gz 328787 RMD160 de905634db3263d24b69ae42887111b7ff95b3ba SHA1 670c5e44f59e3844e2ca0c67730ba9ca5f5228fc SHA256 64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459
 DIST startup-notification-0.9.tar.bz2 226231 RMD160 b9c26d40a8b9cce8e13c729fb77720d4fdcc6de1 SHA1 2c09f43247683d1e4a16b2f8d1e236b57eafae68 SHA256 61de1aed379ea9d44a835baf76567e0aaa813b6d6e995db7e83e8986f69b580d
-EBUILD startup-notification-0.10.ebuild 895 RMD160 2b3c48a6254304ed86acd2017667701cecd079e1 SHA1 17a355ea4bde2fce2f04a0d29cfb0b4f73320306 SHA256 95b9eced280561080da70fd55d400e24dff44ddec538f12a65848cacee6d86cc
+EBUILD startup-notification-0.10.ebuild 1119 RMD160 7e57b65afc95695269eca58cb3d59ec3907153be SHA1 8392f86bd86213c804981dae3776a4b48d4a9cee SHA256 a573b8f1e6e70029fde5afd53139b4bbba736af87c8916e25e92664e9136fb6f
 EBUILD startup-notification-0.9.ebuild 773 RMD160 d1416513f39126af87eda5a6b28da4add76db5a5 SHA1 1149a3627b768e92f8c5dffca4e69dde0460db71 SHA256 3aee5ca5e8cad96126a4814c27b4408303968e1548904563602ffb7417fe6802
-MISC ChangeLog 6671 RMD160 9d562bff67f43a29deb6fa5c3a69dbd336e1d46e SHA1 d9aea50b721c7f95fa9276d8180d60021af5a8cc SHA256 7f73623651d7dabf9116992c15830f4f6931cff0d1533cd1e8f1bd78b4292192
+MISC ChangeLog 6866 RMD160 800905543139a276e6746a61d35243d185cc97ce SHA1 4db5123306c59524436b9d0e5b4b05daa2cdb31f SHA256 4b627b7e7673362142f62d52c2bda03377bcefc94d777fe6f6e188407f341727
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFJ8oE/omPajV0RnrERAnT3AJ4gQFyFfO0jXlgeoN1+GFkAw0Er1QCfW6Yy
-esMSthXFL6grWpPHiJCcN9c=
-=Q9t3
+iEYEARECAAYFAkpsMjkACgkQ1fmVwcYIWAZz2ACghvYYOSplzETM0xq1icDgoLdP
+IrkAoKRVLBQUIPvSomKvxi1VSIdmUUiy
+=PcgO
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch b/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch
new file mode 100644
index 000000000000..612d0b19d77a
--- /dev/null
+++ b/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch
@@ -0,0 +1,14 @@
+Do not build tests unless required.
+
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226257
+--- a/test/Makefile.am	2009-04-03 16:56:51.000000000 +0200
++++ b/test/Makefile.am	2009-07-26 12:08:44.855802976 +0200
+@@ -16,7 +16,7 @@
+ 	test-launcher-xcb			\
+ 	test-watch-xmessages-xcb
+ 
+-noinst_PROGRAMS=$(XLIB_TEST) $(XCB_TEST)
++check_PROGRAMS=$(XLIB_TEST) $(XCB_TEST)
+ 
+ test_launcher_SOURCES= test-launcher.c
+ 
diff --git a/x11-libs/startup-notification/startup-notification-0.10.ebuild b/x11-libs/startup-notification/startup-notification-0.10.ebuild
index d94ca8768053..d54d6799ba98 100644
--- a/x11-libs/startup-notification/startup-notification-0.10.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.10.ebuild
@@ -1,6 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/startup-notification-0.10.ebuild,v 1.1 2009/04/25 03:19:03 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/startup-notification-0.10.ebuild,v 1.2 2009/07/26 10:38:43 eva Exp $
+
+EAPI="2"
+WANT_AUTOMAKE="1.10"
+
+inherit autotools
 
 DESCRIPTION="Application startup notification and feedback library"
 HOMEPAGE="http://www.freedesktop.org/software/startup-notification"
@@ -21,7 +26,18 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-libs/libXt"
 
+src_prepare() {
+	# Do not build tests unless required
+	epatch "${FILESDIR}/${P}-tests.patch"
+
+	eautomake
+}
+
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README doc/startup-notification.txt
+	dodoc AUTHORS ChangeLog NEWS README doc/startup-notification.txt || die "dodoc failed"
 }