Fixing gtk detect. closes 62543

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index e58ec2ee99c64b8b4a5b35dd1dfaa2f9d69012c1..8a65dd011df2c9c96456dc35095abc73425cbecf 100644 (file)
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.24 2004/10/27 12:23:38 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.25 2004/12/07 19:32:04 mholzer Exp $
+
+*mkvtoolnix-0.9.7-r1 (07 Dec 2004)
+
+  07 Dec 2004; Martin Holzer <mholzer@gentoo.org>
+  +mkvtoolnix-0.9.4-r1.ebuild, +mkvtoolnix-0.9.5-r1.ebuild,
+  +mkvtoolnix-0.9.7-r1.ebuild:
+  Fixing gtk detect. closes 62543
 
   27 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> mkvtoolnix-0.9.7.ebuild:
   Fixing bug #69115 (libmatroska-0.7.4 needed).

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 8f4473ca609f160f0befaf59b0f889ca20bae5f8..4795954834a7e6e2464bf9d5fa31e351802c9f36 100644 (file)
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,27 +1,27 @@
-MD5 66b43be1d5f8c1312b0506e07e586125 mkvtoolnix-0.8.1.ebuild 1231
-MD5 66e2bee670cd16dfe72be006a8e4c07a mkvtoolnix-0.9.4.ebuild 1243
-MD5 bdfdd9cbf63d4f8207ed98d1710a0dcb mkvtoolnix-0.8.8.ebuild 1240
-MD5 2148ef238a30d221779161bb38dfc592 mkvtoolnix-0.9.1.ebuild 1240
+MD5 13626dc1f70b81a7bf7734ba36df6087 ChangeLog 3514
+MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
 MD5 002a992c938f66e916bcecbcd7a3341c mkvtoolnix-0.8.5.ebuild 1230
-MD5 8cff583ab1ab30a4ab487f9fc97ba608 mkvtoolnix-0.9.3.ebuild 1243
 MD5 7109797096bd7f20480ce4aee5660034 mkvtoolnix-0.8.7.ebuild 1230
-MD5 cbe874c79e5874e5da092af1ec0109a8 mkvtoolnix-0.9.5.ebuild 1243
-MD5 8ca9bbc2b315bcf75fb687f3108a025a mkvtoolnix-0.9.0.ebuild 1240
+MD5 bdfdd9cbf63d4f8207ed98d1710a0dcb mkvtoolnix-0.8.8.ebuild 1240
 MD5 3a7645ac8f9e0b3f3fdf5aca68098476 mkvtoolnix-0.8.9.ebuild 1240
-MD5 e650d01a0bb749f7f56b832ef429a9ea mkvtoolnix-0.9.7.ebuild 1162
+MD5 66b43be1d5f8c1312b0506e07e586125 mkvtoolnix-0.8.1.ebuild 1231
+MD5 8ca9bbc2b315bcf75fb687f3108a025a mkvtoolnix-0.9.0.ebuild 1240
+MD5 2148ef238a30d221779161bb38dfc592 mkvtoolnix-0.9.1.ebuild 1240
 MD5 996b7a8c02caa222056b3c04d1f0a3f0 mkvtoolnix-0.9.2.ebuild 1243
-MD5 6f302ff7a5d44bbf739af5a151687e86 ChangeLog 3303
-MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
-MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
-MD5 cff9557227e88163e8117b2c72d514a0 files/digest-mkvtoolnix-0.8.1 69
-MD5 b6700b3ceb68fb86a8c19039180d4766 files/digest-mkvtoolnix-0.8.5 69
+MD5 8cff583ab1ab30a4ab487f9fc97ba608 mkvtoolnix-0.9.3.ebuild 1243
+MD5 d2ce2762913ded847d4bef9be322238d mkvtoolnix-0.9.7-r1.ebuild 1190
+MD5 da2a698580715c91a1e1cd94aeed4bd1 mkvtoolnix-0.9.4-r1.ebuild 1272
+MD5 1c3abfb08162f4dc9e05a43da93ca14f mkvtoolnix-0.9.5-r1.ebuild 1272
 MD5 f005d31d1d31828d70e7bd748af89f51 files/digest-mkvtoolnix-0.8.7 69
+MD5 cff9557227e88163e8117b2c72d514a0 files/digest-mkvtoolnix-0.8.1 69
 MD5 a7e203ac13a7fd3575c2f62502ece1dc files/digest-mkvtoolnix-0.8.8 69
+MD5 b6700b3ceb68fb86a8c19039180d4766 files/digest-mkvtoolnix-0.8.5 69
 MD5 c4c0b94f18dc4db0f9f62d51b983a056 files/digest-mkvtoolnix-0.8.9 69
 MD5 cb49b083ecab13d41512758b8e6f9b5a files/digest-mkvtoolnix-0.9.0 69
 MD5 6259fb15b7e8006ee42d0e3eebb86f05 files/digest-mkvtoolnix-0.9.1 69
 MD5 f5c6d64133c8a5f1916f1efa9c618035 files/digest-mkvtoolnix-0.9.2 69
 MD5 1ae151d6db180725ae082124b335ab82 files/digest-mkvtoolnix-0.9.3 69
-MD5 3279a2ed803d5352c6416c3d09881afc files/digest-mkvtoolnix-0.9.4 69
-MD5 2884e660a170f43abfa8d7634cebec36 files/digest-mkvtoolnix-0.9.5 69
-MD5 098605d9da74ba7e766f45d74b6705ff files/digest-mkvtoolnix-0.9.7 69
+MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
+MD5 098605d9da74ba7e766f45d74b6705ff files/digest-mkvtoolnix-0.9.7-r1 69
+MD5 3279a2ed803d5352c6416c3d09881afc files/digest-mkvtoolnix-0.9.4-r1 69
+MD5 2884e660a170f43abfa8d7634cebec36 files/digest-mkvtoolnix-0.9.5-r1 69

diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4-r1
similarity index 100%
rename from media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4
rename to media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4-r1

diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.5 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.5-r1
similarity index 100%
rename from media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.5
rename to media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.5-r1

diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.7 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.7-r1
similarity index 100%
rename from media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.7
rename to media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.7-r1

diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.4.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.4-r1.ebuild
similarity index 87%
rename from media-video/mkvtoolnix/mkvtoolnix-0.9.4.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-0.9.4-r1.ebuild
index 4f95b3b3c4d4f3ecc603b4c28265b5943f347f04..b8b60c910a2631df61d372319ffd707c4014a872 100644 (file)
--- a/media-video/mkvtoolnix/mkvtoolnix-0.9.4.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-0.9.4.ebuild,v 1.1 2004/08/25 19:25:53 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-0.9.4-r1.ebuild,v 1.1 2004/12/07 19:32:04 mholzer Exp $
 
 inherit eutils wxwidgets
 
@@ -30,10 +30,12 @@ src_unpack() {
 }
 
 src_compile() {
-       if ! use gtk2 ; then
-               need-wxwidgets gtk
-       else
-               need-wxwidgets gtk2
+       if use X ; then
+               if ! use gtk2 ; then
+                       need-wxwidgets gtk
+               else
+                       need-wxwidgets gtk2
+               fi
        fi
        ./configure || die "configure died"
        emake || die "make failed"

diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.5.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.5-r1.ebuild
similarity index 87%
rename from media-video/mkvtoolnix/mkvtoolnix-0.9.5.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-0.9.5-r1.ebuild
index 6f4873af2b7d596f81a43852c88a2afc808a5195..bdded53c4ef5c80ba8e8c3de4f5d49b360582af4 100644 (file)
--- a/media-video/mkvtoolnix/mkvtoolnix-0.9.5.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-0.9.5.ebuild,v 1.2 2004/09/02 11:39:34 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-0.9.5-r1.ebuild,v 1.1 2004/12/07 19:32:04 mholzer Exp $
 
 inherit eutils wxwidgets
 
@@ -30,10 +30,12 @@ src_unpack() {
 }
 
 src_compile() {
-       if ! use gtk2 ; then
-               need-wxwidgets gtk
-       else
-               need-wxwidgets gtk2
+       if use X ; then
+               if ! use gtk2 ; then
+                       need-wxwidgets gtk
+               else
+                       need-wxwidgets gtk2
+               fi
        fi
        ./configure || die "configure died"
        emake || die "make failed"

diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.7.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.7-r1.ebuild
similarity index 86%
rename from media-video/mkvtoolnix/mkvtoolnix-0.9.7.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-0.9.7-r1.ebuild
index fb12b471de4a837306ec138ffc823f83416de003..326eb56fb3d73ba28fe0b27a94cb8f4f4c50dc7e 100644 (file)
--- a/media-video/mkvtoolnix/mkvtoolnix-0.9.7.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-0.9.7.ebuild,v 1.2 2004/10/27 12:23:38 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-0.9.7-r1.ebuild,v 1.1 2004/12/07 19:32:04 mholzer Exp $
 
 inherit eutils wxwidgets
 
@@ -28,10 +28,12 @@ src_unpack() {
 }
 
 src_compile() {
-       if ! use gtk2 ; then
-               need-wxwidgets gtk
-       else
-               need-wxwidgets gtk2
+       if use X ; then
+               if ! use gtk2 ; then
+                       need-wxwidgets gtk
+               else
+                       need-wxwidgets gtk2
+               fi
        fi
        ./configure || die "configure died"
        emake || die "make failed"