Cleanup of mkvtoolnix-1.4.2 dependencies and useflags.

(Portage version: 2.0.51.19)

4 files changed, 82 insertions, 29 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 9838d6f88ebf..151c00cc2f44 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.30 2005/04/18 16:54:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.31 2005/04/18 17:46:56 flameeyes Exp $
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mkvtoolnix-configure-checks.patch, mkvtoolnix-1.4.2.ebuild:
+  Cleanup of useflags, removed oggvorbis as it's a requested dependency, added
+  patch to enforce disabling of flac, renamed X useflag to wxwindows as it
+  enables wxGTK support. Moved wxwidget selection into pkg_setup (under
+  wxwindows useflag conditional).
 
 *mkvtoolnix-1.4.2 (18 Apr 2005)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 2d6b33481b4e..db1fc8f1bf9b 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 66624191f93095d7549ad7eaf9588106 mkvtoolnix-1.0.1.ebuild 1133
-MD5 9d34018fdafbef883f178c4e97389721 mkvtoolnix-0.9.7-r1.ebuild 1192
-MD5 4e741e0540d201ac85bc03c1cd8c6b19 mkvtoolnix-1.4.2.ebuild 1134
-MD5 240c69ba609af9182deed35a0ba20453 mkvtoolnix-0.9.5-r1.ebuild 1274
 MD5 12180c8bb89dc277064ecfc7dd3c4b6f ChangeLog 4610
 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
+MD5 240c69ba609af9182deed35a0ba20453 mkvtoolnix-0.9.5-r1.ebuild 1274
+MD5 9d34018fdafbef883f178c4e97389721 mkvtoolnix-0.9.7-r1.ebuild 1192
+MD5 66624191f93095d7549ad7eaf9588106 mkvtoolnix-1.0.1.ebuild 1133
+MD5 52f82c987ba2745e4cf1f242b64f6a93 mkvtoolnix-1.4.2.ebuild 1609
+MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
 MD5 2884e660a170f43abfa8d7634cebec36 files/digest-mkvtoolnix-0.9.5-r1 69
 MD5 098605d9da74ba7e766f45d74b6705ff files/digest-mkvtoolnix-0.9.7-r1 69
-MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
 MD5 ad428bfa241077dcaf0763b2e5a1462a files/digest-mkvtoolnix-1.0.1 69
 MD5 f54516810bdfda76c7859d328889f01f files/digest-mkvtoolnix-1.4.2 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCY+Zw06ebR+OMO78RAsfiAJ468tLTn4YGhzkX7qgU9/KaI9OCWwCfcusV
-PpgF3MORw1uvT5OpOZRUnug=
-=NNJG
------END PGP SIGNATURE-----
+MD5 e7fad70f0521de5b83e98ff6955408a7 files/mkvtoolnix-configure-checks.patch 1092
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-configure-checks.patch b/media-video/mkvtoolnix/files/mkvtoolnix-configure-checks.patch
new file mode 100644
index 000000000000..a75fc8b7a207
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-configure-checks.patch
@@ -0,0 +1,35 @@
+--- mkvtoolnix-1.4.2/configure.in	2005-04-09 19:36:20.000000000 +0200
++++ mkvtoolnix-1.4.2-configure/configure.in	2005-04-18 19:10:35.679161416 +0200
+@@ -460,11 +460,19 @@
+ dnl
+ dnl Check for libFLAC
+ dnl
+-  AC_CHECK_LIB(FLAC, FLAC__seekable_stream_decoder_new,
+-               [ FLAC_LIBS="-lFLAC -lm"
+-                 flac_found=yes ],
+-               [ flac_found=no ],
+-               "-lm")
++  AC_ARG_WITH([flac],
++              AC_HELP_STRING([--without-flac], [do not build with flac support]),
++              [ with_flac=${withval} ], [ with_flac=yes ])
++
++  if test "$with_flac" != "no"; then
++    AC_CHECK_LIB(FLAC, FLAC__seekable_stream_decoder_new,
++                 [ FLAC_LIBS="-lFLAC -lm"
++                   flac_found=yes ],
++                 [ flac_found=no ],
++                 "-lm")
++  else
++    flac_found=no
++  fi
+   if test "$flac_found" = "yes"; then
+     AC_CHECK_MEMBER(FLAC__StreamMetadata_StreamInfo.sample_rate, ,
+                     [ flac_found=no ],
+@@ -488,7 +496,6 @@
+     opt_features_no="$opt_features_no; FLAC audio"
+   fi
+ 
+-
+ AC_SUBST(FLAC_LIBS)
+ 
+ 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild
index bed687ba1206..cfded62ec9ca 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild,v 1.1 2005/04/18 16:54:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild,v 1.2 2005/04/18 17:46:56 flameeyes Exp $
 
 inherit eutils wxwidgets
 
@@ -11,32 +11,52 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="gtk2 X oggvorbis flac"
+IUSE="gtk2 wxwindows flac bzip2 lzo"
 
 DEPEND=">=dev-libs/libebml-0.7.3
 	>=media-libs/libmatroska-0.7.5
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.2-r2 )
-	flac? ( >=media-libs/flac-1.1.0 )
+	media-libs/libogg
+	media-libs/libvorbis
 	dev-libs/expat
-	app-arch/bzip2
 	sys-libs/zlib
-	dev-libs/lzo"
+	wxwindows? ( >=x11-libs/wxGTK-2.4.2-r2 )
+	flac? ( >=media-libs/flac-1.1.0 )
+	bzip2? ( app-arch/bzip2 )
+	lzo? ( dev-libs/lzo )"
 
-src_compile() {
-	if use X ; then
+pkg_setup() {
+	if use wxwindows; then
 		if ! use gtk2 ; then
-			need-wxwidgets gtk
+			need-wxwidgets gtk || die "You must compile wxGTK without wx_nogtk useflag."
 		else
-			need-wxwidgets gtk2
+			need-wxwidgets gtk2 || die "You must compile wxGTK with gtk2 useflag."
 		fi
+	elif use gtk2; then
+		einfo "You won't have gtk2 support as you requested not to use wxwindows."
 	fi
-	econf || die "./configure died"
+}
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	epatch ${FILESDIR}/${PN}-configure-checks.patch
+	./autogen.sh
+}
+
+src_compile() {
+	econf \
+		$(use_enable lzo) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable wxwindows gui) \
+		$(use_with flac) \
+		|| die "./configure died"
+
 	emake || die "make failed"
 }
 
 src_install() {
 	einstall || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+	dodoc AUTHORS ChangeLog README TODO
 	dohtml doc/mkvmerge-gui.html doc/images/*
 }