Don't build tests and examples during standard make, this saves a few gcc/ld calls...

Package-Manager: portage-2.1.4.4

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index 45b671bfd4fda6e754209ef77fbc0f1327e6468f..93234ddf34dd9b1e97c4a08da2141e553abdae17 100644 (file)
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.80 2008/02/15 12:16:53 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.81 2008/02/22 13:27:43 flameeyes Exp $
+
+  22 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libsndfile-1.0.17-dontbuild-tests-examples.patch,
+  +files/libsndfile-1.0.17-regtests-need-sqlite.patch,
+  libsndfile-1.0.17-r1.ebuild:
+  Don't build tests and examples during standard make, this saves a few gcc/ld
+  calls for most users. Don't build regtest if sqlite is disabled, rather than
+  just removing it after the fact. Don't request old version of automake, as
+  full eautoreconf is called.
 
   15 Feb 2008; Samuli Suominen <drac@gentoo.org>
   libsndfile-1.0.17-r1.ebuild:

diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index ca0513d46216dd07e72bc526f8030da9784f04d8..8e7b1cdc0c29505c68ea155dac298dba6cbb702b 100644 (file)
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libsndfile-1.0.17-dontbuild-tests-examples.patch 1136 RMD160 db06699e750c011fa2b615bb8f1959732b2ca256 SHA1 a5cb295572987e79288222aed7697bddc07dc82d SHA256 1eae0c560959f33e1e8fc482890d8c1fab3746d251b3eb57e9235f92c8acacd6
 AUX libsndfile-1.0.17-flac-buffer-overflow.patch 1518 RMD160 41fbc8cddbc252f6b49a8a19d48ec4a09966371d SHA1 aaa818fdfa35002af77b84b19398dae5c3f53744 SHA256 f080aa485cdcc5940ba4e54f6f7295233c4947f2ba6a6dbe6681036a655543d6
 AUX libsndfile-1.0.17-ogg.patch 385 RMD160 7f2bee213423b77b7a03f209b75ababcbe21f215 SHA1 d06d5db4aa6b7aa0964c2bdd5730068c88a7ce91 SHA256 1237b34a26b2b29998235495762aadd316761ee4cdeb148c74872b9669b4c866
+AUX libsndfile-1.0.17-regtests-need-sqlite.patch 894 RMD160 a36d14dc91a8768386f414cbfe8b0cc53de938c3 SHA1 522d55e46ef6c83a158fb026d5f37f63b78438ad SHA256 c53026864c6a05b1ccc8b12e7af895f5d0e2d3a00335fd9f49ed7cc9aecece73
 DIST libsndfile-1.0.17+flac-1.1.3.patch.bz2 3127 RMD160 fc6e6f03069c1ad8ee43f600f6ac2aa6e97bb1f5 SHA1 10e0d19dfc8cf2a6bf499e0fa0d1ab17dca4c519 SHA256 2c8b6df283309061e8e9aaedd0bc20c7ebf75fa8ad4ed8b01f7bf04162206df1
 DIST libsndfile-1.0.17.tar.gz 819456 RMD160 ae93822a4c587dcdd7c70d043d2a38ed2fe3a188 SHA1 2f66798d596a15491fbd1191ded8125ed71ef411 SHA256 1792e4e60386b450ef8ec07c756e8f3ecfe96ebda7d0b09148da5f436d065ef2
-EBUILD libsndfile-1.0.17-r1.ebuild 1591 RMD160 d14ade4026da670662fc6d30221307ec351e3031 SHA1 434028a135eb556b375231016da2aaa16cfc9774 SHA256 70517b1b414a79c66df05839d9914e890abcb55d7b5d18b6d98d87e82a66e5b6
+EBUILD libsndfile-1.0.17-r1.ebuild 1488 RMD160 cb167a7ac3efcdae777270427e1aa0804296f417 SHA1 a297a7c3de61e87b41402aacfb085a264b57caaf SHA256 18b1c4a2448edb91c224d74c05544526cea1bd7eaec45f683759614f6eb72409
 EBUILD libsndfile-1.0.17.ebuild 1350 RMD160 3191030f0d1d2ef84523d84e950ce795e6dd01d3 SHA1 259b98a9404acdd64711cd8a523b0f330cd39dac SHA256 4044e62687cbeb7f44c06faa1e8116efea050a3d0a00856a7e8c74f151c90956
-MISC ChangeLog 11420 RMD160 805d398fcd8dcd85d11515af5ef2e8e507390765 SHA1 d2e03df0544817e455210a6a12e3f726ddac5a04 SHA256 e47ab1af871d6bdb4b4e93ee0b17ee5afe8a71c01515f3ceb7a57d828332f88c
+MISC ChangeLog 11889 RMD160 1b8b2e743a315e3868915ca6bdfdc4abb00dd68c SHA1 a6c72aee13ab9fe18b2a27cc3ab32e336b16cdb2 SHA256 cc77682be4dfd04e49497d1ed6d22d8fd80c68f0877169fb52d7c8ad0543bf10
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHvs3VAiZjviIA2XgRAv4vAKCNuGqhw/EmbSOVbJMvN5SSr3Ch1ACg3W8p
+8Z6k5g5sncw4DhMPNXj49iw=
+=1y91
+-----END PGP SIGNATURE-----

diff --git a/media-libs/libsndfile/files/libsndfile-1.0.17-dontbuild-tests-examples.patch b/media-libs/libsndfile/files/libsndfile-1.0.17-dontbuild-tests-examples.patch
new file mode 100644 (file)
index 0000000..456c539
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.17-dontbuild-tests-examples.patch
@@ -0,0 +1,25 @@
+Index: libsndfile-1.0.17/examples/Makefile.am
+===================================================================
+--- libsndfile-1.0.17.orig/examples/Makefile.am
++++ libsndfile-1.0.17/examples/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ bin_PROGRAMS = sndfile-info sndfile-play sndfile-convert
+ 
+-noinst_PROGRAMS = make_sine sfprocess list_formats cooledit-fixer generate
++EXTRA_PROGRAMS = make_sine sfprocess list_formats cooledit-fixer generate
+ 
+ # This is the BeOS version of sndfile-play. It needs to be compiled with the C++
+ # compiler.
+Index: libsndfile-1.0.17/tests/Makefile.am
+===================================================================
+--- libsndfile-1.0.17.orig/tests/Makefile.am
++++ libsndfile-1.0.17/tests/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-noinst_PROGRAMS = sfversion floating_point_test write_read_test \
++check_PROGRAMS = sfversion floating_point_test write_read_test \
+       lossy_comp_test error_test ulaw_test alaw_test dwvw_test \
+       peak_chunk_test command_test stdin_test stdout_test stdio_test \
+       pcm_test headerless_test pipe_test benchmark header_test misc_test \

diff --git a/media-libs/libsndfile/files/libsndfile-1.0.17-regtests-need-sqlite.patch b/media-libs/libsndfile/files/libsndfile-1.0.17-regtests-need-sqlite.patch
new file mode 100644 (file)
index 0000000..85d6280
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.17-regtests-need-sqlite.patch
@@ -0,0 +1,25 @@
+Index: libsndfile-1.0.17/configure.ac
+===================================================================
+--- libsndfile-1.0.17.orig/configure.ac
++++ libsndfile-1.0.17/configure.ac
+@@ -268,6 +268,7 @@ else
+       fi
+ 
+ AC_DEFINE_UNQUOTED([HAVE_SQLITE3],$HAVE_SQLITE3,[Set to 1 if you have libsqlite3.])
++AM_CONDITIONAL(HAVE_SQLITE3, [test "x$ac_cv_sqlite3" = "xyes"])
+ 
+ #====================================================================================
+ # Determine if the processor can do clipping on float to int conversions.
+Index: libsndfile-1.0.17/regtest/Makefile.am
+===================================================================
+--- libsndfile-1.0.17.orig/regtest/Makefile.am
++++ libsndfile-1.0.17/regtest/Makefile.am
+@@ -1,6 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
+ 
++if HAVE_SQLITE3
+ bin_PROGRAMS = sndfile-regtest
++endif
+ 
+ noinst_HEADERS = regtest.h
+ 

diff --git a/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild
index 7c3e8a40ee762c318979690cb3a70a9102f3a776..947879d7a0d6acbb5e1085ad228baf6b10f1ca4c 100644 (file)
--- a/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild,v 1.11 2008/02/15 17:16:55 mr_bones_ Exp $
-
-WANT_AUTOCONF=2.5
-WANT_AUTOMAKE=1.9
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.17-r1.ebuild,v 1.12 2008/02/22 13:27:43 flameeyes Exp $
 
 inherit eutils libtool autotools
 
@@ -32,6 +29,8 @@ src_unpack() {
        epatch "${WORKDIR}/${P}+flac-1.1.3.patch"
        epatch "${FILESDIR}/${P}-ogg.patch"
        epatch "${FILESDIR}/${P}-flac-buffer-overflow.patch"
+       epatch "${FILESDIR}/${P}-dontbuild-tests-examples.patch"
+       epatch "${FILESDIR}/${P}-regtests-need-sqlite.patch"
        eautoreconf
        epunt_cxx
 }
@@ -49,7 +48,4 @@ src_compile() {
 src_install() {
        emake -j1 DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install || die "emake install failed."
        dodoc AUTHORS ChangeLog NEWS README TODO
-       # Only prints following message: "This program was not compiled
-       # with libsqlite3 and hence doesn't work." wrt bug #210161.
-       use sqlite || rm -f "${D}"/usr/bin/sndfile-regtest
 }