Add patch to avoid building examples, as we would be deleting them right afterward. See upstream bug #14468.

(Portage version: 2.1.4.4)

3 files changed, 132 insertions, 4 deletions

diff --git a/dev-libs/liboil/ChangeLog b/dev-libs/liboil/ChangeLog
index 8f3b87446ecc..1eb0f221728a 100644
--- 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/files/liboil-0.3.12-dontbuild-examples.patch b/dev-libs/liboil/files/liboil-0.3.12-dontbuild-examples.patch
new file mode 100644
index 000000000000..7b2394e7235c
--- /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 5f6d4ff310b1..5e7cf0cbf0f6 100644
--- 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
 }