Disable building of examples. Closes bug #226339

(Portage version: 2.1.5.5)

4 files changed, 81 insertions, 23 deletions

diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog
index 5af774feaa99..a4f2cf97bbc7 100644
--- a/media-libs/libdvdnav/ChangeLog
+++ b/media-libs/libdvdnav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdvdnav
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.40 2008/05/08 01:17:46 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.41 2008/06/16 11:44:03 flameeyes Exp $
+
+  16 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/libdvdnav-0.1.10-build.patch,
+  +files/libdvdnav-0.1.10-dontbuild-examples.patch, libdvdnav-0.1.10.ebuild:
+  Disable building of examples. Closes bug #226339
 
   08 May 2008; Steve Dibb <beandog@gentoo.org>
   -libdvdnav-4.1.1_p997-r1.ebuild:
diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch
index 9c0bdda9e206..4d439c175d52 100644
--- a/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch
+++ b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch
@@ -1,29 +1,33 @@
 Use CFLAGS from environment and make sure we install the .m4 into the
 correct place regardless of whether `aclocal` is installed on the host.
-
---- configure
-+++ configure
-@@ -21459,8 +21459,9 @@
-     ;;
- esac
- 
+Index: libdvdnav-0.1.10/configure.ac
+===================================================================
+--- libdvdnav-0.1.10.orig/configure.ac
++++ libdvdnav-0.1.10/configure.ac
+@@ -175,8 +175,9 @@ dnl ------------------------------------
+ dnl cflags
+ dnl ---------------------------------------------
+ dnl Common cflags for all platforms
 -CFLAGS="-O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $CFLAGS"
 -DEBUG_CFLAGS="-g -DDEBUG $CFLAGS"
-+CFLAGS="$CFLAGS -Wall"
-+CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
-+DEBUG_CFLAGS="$CFLAGS -g -DDEBUG"
- 
++CFLAGS="${CFLAGS} -Wall"
++CPPFLAGS="${CPPFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
++DEBUG_CFLAGS="${CFLAGS} -g -DDEBUG"
  
+ AC_SUBST(DEBUG_CFLAGS)
  
---- m4/Makefile.in
-+++ m4/Makefile.in
-@@ -116,8 +116,7 @@
+Index: libdvdnav-0.1.10/m4/Makefile.am
+===================================================================
+--- libdvdnav-0.1.10.orig/m4/Makefile.am
++++ libdvdnav-0.1.10/m4/Makefile.am
+@@ -2,10 +2,6 @@ include $(top_srcdir)/misc/Makefile.comm
  
  EXTRA_DIST = dvdnav.m4
  
--@INSTALL_M4_TRUE@m4datadir = @ACLOCAL_DIR@
--@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal
-+m4datadir = $(datadir)/aclocal
+-if INSTALL_M4
+-m4datadir = @ACLOCAL_DIR@
+-else
+ m4datadir = $(datadir)/aclocal
+-endif
  
  m4data_DATA = dvdnav.m4
- subdir = m4
diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch b/media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch
new file mode 100644
index 000000000000..ff916c7552de
--- /dev/null
+++ b/media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch
@@ -0,0 +1,34 @@
+Index: libdvdnav-0.1.10/configure.ac
+===================================================================
+--- libdvdnav-0.1.10.orig/configure.ac
++++ libdvdnav-0.1.10/configure.ac
+@@ -171,6 +171,12 @@ case $host in
+     ;;
+ esac
+ 
++AC_ARG_ENABLE([examples],
++  AS_HELP_STRING([--disable-examples], [Don't build examples during build phase]),
++  [enable_examples=$enableval], [enable_examples=yes])
++
++AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$enable_examples" = "xyes"])
++
+ dnl ---------------------------------------------
+ dnl cflags
+ dnl ---------------------------------------------
+Index: libdvdnav-0.1.10/Makefile.am
+===================================================================
+--- libdvdnav-0.1.10.orig/Makefile.am
++++ libdvdnav-0.1.10/Makefile.am
+@@ -2,7 +2,11 @@ include $(top_srcdir)/misc/Makefile.comm
+ 
+ AUTOMAKE_OPTIONS = 1.3
+ 
+-SUBDIRS = src examples doc misc m4
++SUBDIRS = src doc misc m4
++
++if BUILD_EXAMPLES
++SUBDIRS += examples
++endif
+ 
+ DEBFILES = debian/README.Debian debian/bug-presubj debian/changelog \
+ 	debian/control debian/copyright debian/dvdnav-config.1 \
diff --git a/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild b/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild
index 5a173b373754..cb0c6354e2d4 100644
--- a/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild,v 1.17 2008/01/29 21:41:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild,v 1.18 2008/06/16 11:44:03 flameeyes Exp $
 
-inherit eutils
+inherit eutils base autotools
 
 DESCRIPTION="Library for DVD navigation tools"
 HOMEPAGE="http://sourceforge.net/projects/dvd/"
@@ -16,10 +16,25 @@ IUSE=""
 RDEPEND="media-libs/libdvdread"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-dontbuild-examples.patch
+)
+
 src_unpack() {
-	unpack ${A}
+	base_src_unpack
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--disable-examples \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+
+	emake || die "emake failed"
 }
 
 src_install () {