Add patch to avoid building examples, as we would be deleting them right afterward...

Package-Manager: portage-2.1.4.4

diff --git a/dev-libs/liboil/ChangeLog b/dev-libs/liboil/ChangeLog
index 8f3b87446ecc5a7960b2193763f60434f654c95c..1eb0f221728a4cb403a2dd9cca690d8a288f364d 100644 (file)
--- a/dev-libs/liboil/ChangeLog
+++ b/dev-libs/liboil/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/liboil
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/ChangeLog,v 1.56 2007/09/19 16:57:58 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/ChangeLog,v 1.57 2008/02/12 13:02:55 flameeyes Exp $
+
+  12 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/liboil-0.3.12-dontbuild-examples.patch, liboil-0.3.12.ebuild:
+  Add patch to avoid building examples, as we would be deleting them right
+  afterward. See upstream bug #14468.
 
   19 Sep 2007; Christoph Mende <angelos@gentoo.org> liboil-0.3.12.ebuild:
   Stable on amd64 wrt bug #192822

diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index b2a4a1ca8c9fed444421b17ac83b54271db77a2b..ce7213f63d348f792ca34e1222731ddbfac8fdd4 100644 (file)
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX liboil-0.3.10-sse2revert.diff 508 RMD160 aa6cfa6c8600d655893169ae7bc3705bdda6f0c3 SHA1 f7aa38adcbbd24b340a38a071caa522915dc9e63 SHA256 94ca438c25fe1130d621eee9c6f8e0bf883d6114eff643f11b64e2a452f55527
+AUX liboil-0.3.12-dontbuild-examples.patch 3783 RMD160 d7b4ae24cb29ff982c75c17dadac79348a5292f5 SHA1 7aca923fdbbdc639fff8939b02e1df8e57dbdb21 SHA256 22280e9aac7c14ec719c49d635dea1c50b03157846a4efcbdcc9c2eff3aa54b9
 DIST liboil-0.3.10.tar.gz 860303 RMD160 585413d5955b08b24cec18f588927ac071a44098 SHA1 00183731d417047a3b7715532b9d6ca5cce16cc4 SHA256 4587753a023550a066abe59a7e467c1af35b9f5e81bfb40a12463ad2df8f088c
 DIST liboil-0.3.12.tar.gz 810532 RMD160 0fb494f816d60889a745320bd021add972be1684 SHA1 b6bf01ba31ce090e426391a9ea8ef6daf6739e96 SHA256 9be2cdd17214935b0dd2bac1508c9db1df88c60bba91652f0a2944aa93a7b53d
 EBUILD liboil-0.3.10-r1.ebuild 972 RMD160 6dddb32ac4015a959176a85ee9eb9b3c0d8d7670 SHA1 b52d066b98e6fc5881b1633833f9fc89386f29ec SHA256 f5b4ddc0c24bc41b96950bb8fdcc444eb7d8e7fbbab6733acd55e1d8bcea3649
-EBUILD liboil-0.3.12.ebuild 938 RMD160 9c64f4f02d2ebbd8139195e1274666c8485716c2 SHA1 e52fb819c61bb47233e01713d8e8f9de0cf52dc1 SHA256 2ed8bf25408acd5d3929191c53cd4c3796fe743fe925a198338eda7bea5a3839
-MISC ChangeLog 6967 RMD160 59f13bbe50c3f870e3ad3a0e8a85b8488c42deb2 SHA1 19d67250beac1a516984167c2e0787bc51e08c4e SHA256 07a1fa9f0ba042ffb4a159ef8d13b987032429046ac08e643b8b49f8b9ac0270
+EBUILD liboil-0.3.12.ebuild 992 RMD160 89bbb43978f9e2292bfea9f8fb9a063fb9836584 SHA1 8089549f2f8ceac454aecac51edc3c27159d3dcc SHA256 da8a6123bd0255346ad8707f339df0d2e36cd796745d3984584640af9ecfb461
+MISC ChangeLog 7207 RMD160 74b05c48890d93b1244437250c152903a543a1cf SHA1 6350c6c21613582bb7c51304204c89d8ca3debf9 SHA256 6035c07b71cfeed7ae0b6e4dd2610276fd0218cafc790a88449fc9c671800c41
 MISC metadata.xml 221 RMD160 49324ffe8591a528e868fb1885cd427dcf0c7504 SHA1 4e4a3d5488c51d36cecca74643d40a9d44dbc0c6 SHA256 cf7931e4eb32187b0cc468592a123fa76e7661d6f79cd413e19b22d88100593a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsZkFAiZjviIA2XgRAv2jAJ97Odw1Cwje/TD/6U5wPbNyS3KQkQCffbdL
+y/Rewt7Dxfzugl+iJADHz4o=
+=EW5b
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/liboil/files/liboil-0.3.12-dontbuild-examples.patch b/dev-libs/liboil/files/liboil-0.3.12-dontbuild-examples.patch
new file mode 100644 (file)
index 0000000..7b2394e
--- /dev/null
+++ b/dev-libs/liboil/files/liboil-0.3.12-dontbuild-examples.patch
@@ -0,0 +1,122 @@
+Index: liboil-0.3.12/examples/audioresample/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/audioresample/Makefile.am
++++ liboil-0.3.12/examples/audioresample/Makefile.am
+@@ -1,8 +1,8 @@
+ 
+-noinst_PROGRAMS = test_functable1
++EXTRA_PROGRAMS = test_functable1
+ 
+-noinst_LTLIBRARIES = libaudioresample.la
+-#noinst_PROGRAMS = audioresample_test
++EXTRA_LTLIBRARIES = libaudioresample.la
++#EXTRA_PROGRAMS = audioresample_test
+ 
+ libaudioresample_la_SOURCES = functable.c resample.c
+ libaudioresample_la_CFLAGS = $(LIBOIL_CFLAGS) $(GLIB_CFLAGS)
+Index: liboil-0.3.12/examples/huffman/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/huffman/Makefile.am
++++ liboil-0.3.12/examples/huffman/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-noinst_PROGRAMS = huffman_test
++EXTRA_PROGRAMS = huffman_test
+ 
+ huffman_test_SOURCES = \
+       huffman.c \
+Index: liboil-0.3.12/examples/jpeg/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/jpeg/Makefile.am
++++ liboil-0.3.12/examples/jpeg/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ 
+-noinst_LTLIBRARIES = libjpeg.la
+-noinst_PROGRAMS = jpeg_test jpeg_rgb_test
++EXTRA_LTLIBRARIES = libjpeg.la
++EXTRA_PROGRAMS = jpeg_test jpeg_rgb_test
+ 
+ libjpeg_la_SOURCES = \
+       jpeg.c \
+Index: liboil-0.3.12/examples/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/Makefile.am
++++ liboil-0.3.12/examples/Makefile.am
+@@ -3,7 +3,7 @@ SUBDIRS = jpeg md5 uberopt work huffman 
+ 
+ bin_PROGRAMS = oil-bugreport
+ 
+-noinst_PROGRAMS = example1 oil-graph oil-inspect oil-test memcpy-speed \
++EXTRA_PROGRAMS = example1 oil-graph oil-inspect oil-test memcpy-speed \
+       oil-suggest printcpu oil-mt19937 report oil-random
+ 
+ 
+Index: liboil-0.3.12/examples/md5/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/md5/Makefile.am
++++ liboil-0.3.12/examples/md5/Makefile.am
+@@ -1,6 +1,6 @@
+ 
+ 
+-noinst_PROGRAMS = md5sum
++EXTRA_PROGRAMS = md5sum
+ 
+ md5sum_SOURCES = md5sum.c
+ md5sum_CFLAGS = $(LIBOIL_CFLAGS)
+Index: liboil-0.3.12/examples/taylor/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/taylor/Makefile.am
++++ liboil-0.3.12/examples/taylor/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-noinst_PROGRAMS = example1
++EXTRA_PROGRAMS = example1
+ 
+ 
+ example1_SOURCES = example1.c
+Index: liboil-0.3.12/examples/uberopt/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/uberopt/Makefile.am
++++ liboil-0.3.12/examples/uberopt/Makefile.am
+@@ -3,9 +3,9 @@ EXTRA_DIST = example.c
+ 
+ 
+ if HAVE_GLIB
+-noinst_PROGRAMS = uberopt
++EXTRA_PROGRAMS = uberopt
+ else
+-noinst_PROGRAMS = 
++EXTRA_PROGRAMS = 
+ endif
+ 
+ uberopt_SOURCES = uberopt.c
+Index: liboil-0.3.12/examples/videoscale/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/videoscale/Makefile.am
++++ liboil-0.3.12/examples/videoscale/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ 
+-noinst_LTLIBRARIES = libvideoscale.la
+-#noinst_PROGRAMS = videoscale_test
++EXTRA_LTLIBRARIES = libvideoscale.la
++#EXTRA_PROGRAMS = videoscale_test
+ 
+ libvideoscale_la_SOURCES = vs_4tap.c vs_image.c vs_scanline.c
+ libvideoscale_la_CFLAGS = $(LIBOIL_CFLAGS)
+Index: liboil-0.3.12/examples/work/Makefile.am
+===================================================================
+--- liboil-0.3.12.orig/examples/work/Makefile.am
++++ liboil-0.3.12/examples/work/Makefile.am
+@@ -1,8 +1,8 @@
+ 
+ if HAVE_GLIB
+-noinst_PROGRAMS = work
++EXTRA_PROGRAMS = work
+ else
+-noinst_PROGRAMS = 
++EXTRA_PROGRAMS = 
+ endif
+ 
+ work_SOURCES = work.c

diff --git a/dev-libs/liboil/liboil-0.3.12.ebuild b/dev-libs/liboil/liboil-0.3.12.ebuild
index 5f6d4ff310b1cd34d4cd0ff276c991298f53f1d7..5e7cf0cbf0f657b434878dbedddc1b88d771bea0 100644 (file)
--- a/dev-libs/liboil/liboil-0.3.12.ebuild
+++ b/dev-libs/liboil/liboil-0.3.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.12.ebuild,v 1.7 2007/09/19 16:57:58 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.12.ebuild,v 1.8 2008/02/12 13:02:55 flameeyes Exp $
 
 inherit flag-o-matic autotools
 
@@ -19,6 +19,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/liboil-0.3.10-sse2revert.diff
+       epatch "${FILESDIR}"/${P}-dontbuild-examples.patch
        AT_M4DIR="m4" eautoreconf
 }