Disable building of examples. Closes bug #226339

Package-Manager: portage-2.1.5.5

5 files changed, 95 insertions, 26 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/Manifest b/media-libs/libdvdnav/Manifest
index a598663cfaf9..d68cdb39e0a6 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,5 +1,16 @@
-AUX libdvdnav-0.1.10-build.patch 703 RMD160 306586c2ea31f0ddab02a650d233c63c13aed75b SHA1 7abb16303edf1a4932fc5f69215ef6a0397c4876 SHA256 8afa8ad9dfcf5a78503ba75df407da4318b0e259fbc670f1443d56cc8f1e9297
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libdvdnav-0.1.10-build.patch 1133 RMD160 c435ee25f95d1cace48a3be3a2c3b9c8c45269ea SHA1 a2abf53a0da778734b2d8bd65da6ade04b14f23c SHA256 12e01d600d01360533659bb66dc8875440e74611835971057c7de5a525e52098
+AUX libdvdnav-0.1.10-dontbuild-examples.patch 1090 RMD160 113af01ad1bebb4196d45f837de72a4d45275f26 SHA1 7a11aeea8aa2287530fc90feaa184033e9b46c6d SHA256 da64fd41e06f40c96bd9b29e69b69f8886ad614654102223cea4a1ad5f36cd65
 DIST libdvdnav-0.1.10.tar.gz 539803 RMD160 75e7878ab6fd99294b5a1c8fca1391bdbf113616 SHA1 22289cb8f297664ce36551b818c0083e936632a7 SHA256 c2c6ee274cbd5759715a786b949df8ac3e848ffc771173c4f006b88c665346d0
-EBUILD libdvdnav-0.1.10.ebuild 699 RMD160 8d44aa4ae4269ba442e68f0b1cab2084204e41b8 SHA1 2aca6c235a741e2d6535cf20046e5c5cf351ad40 SHA256 50280f15d2a8857077097e13dd8d025b699e78e53e20c8cd47b23d58f568b037
-MISC ChangeLog 5129 RMD160 814914b0a7d5b9a9bed7489e8e9d58fad64aeddb SHA1 55186cb29538f81325cad39ee48c370d21ab77ff SHA256 4dc5243031cb471ee70f77f74691af24f91bed88bddbe75d1d8e4e549b220f20
+EBUILD libdvdnav-0.1.10.ebuild 924 RMD160 63f24e99428e67b9e11efec65351688a191f1924 SHA1 f27299434079b9a5aaafc3b21cb673d5e9881c69 SHA256 fc659c47944c9a21e28f60f21e1d87844255ee4d300b49b8362810a265d866bd
+MISC ChangeLog 5351 RMD160 de3dfe108bf96ae8e99f6b64093843ac26759b10 SHA1 df826ec022c78ba0a9ee241d63ba2dea30d8549c SHA256 eea1c4093c9c640d9eba08d619cd7962c3329a18636f8e0ef9ed48ccb4cd4f61
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhWUgoACgkQAiZjviIA2Xg9BACeP+6iXO1I+rzVsktQpIRzD4tR
+CeoAnjRtmzw5Zmt43TWqvOzn0ZKOwfaa
+=GvYY
+-----END PGP SIGNATURE-----
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 () {