summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dibb <beandog@gentoo.org>2006-09-07 22:44:21 +0000
committerSteve Dibb <beandog@gentoo.org>2006-09-07 22:44:21 +0000
commit231ff223b35e4b5584ee61d1fe18a0c3b530985d (patch)
treed449ef6f0be16471a20790d9e64e2f75b56baf3a /media-video/mkvtoolnix
parentbad enewuser usage, check if user already exists is done by eclass, bug #142754 (diff)
downloadhistorical-231ff223b35e4b5584ee61d1fe18a0c3b530985d.tar.gz
historical-231ff223b35e4b5584ee61d1fe18a0c3b530985d.tar.bz2
historical-231ff223b35e4b5584ee61d1fe18a0c3b530985d.zip
Revert changes, remove --as-needed stripping
Package-Manager: portage-2.1-r2
Diffstat (limited to 'media-video/mkvtoolnix')
-rw-r--r--media-video/mkvtoolnix/ChangeLog5
-rw-r--r--media-video/mkvtoolnix/Manifest16
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild12
3 files changed, 16 insertions, 17 deletions
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 651600f098d8..1d07685812c6 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mkvtoolnix
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.55 2006/09/07 22:06:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.56 2006/09/07 22:44:21 beandog Exp $
+
+ 07 Sep 2006; Steve Dibb <beandog@gentoo.org> mkvtoolnix-1.7.0.ebuild:
+ Revert changes, remove stripping --as-needed
07 Sep 2006; Steve Dibb <beandog@gentoo.org> mkvtoolnix-1.7.0.ebuild:
Simpler checking of wxGTK USE flags, wrt bug #146756
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 8815e236c509..009408bacf5f 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -9,14 +9,14 @@ EBUILD mkvtoolnix-1.6.5.ebuild 1580 RMD160 85f7c609870b4bc9d5fc88de79f191b76d60c
MD5 2b4bce4ba60a04cf88abb25236d580b2 mkvtoolnix-1.6.5.ebuild 1580
RMD160 85f7c609870b4bc9d5fc88de79f191b76d60cb9c mkvtoolnix-1.6.5.ebuild 1580
SHA256 c21d954de91a675d8dea23833ada8f6c144aeef9c96d1574cb3d0ec8e4f6917b mkvtoolnix-1.6.5.ebuild 1580
-EBUILD mkvtoolnix-1.7.0.ebuild 1568 RMD160 2988488eafa60032b605fff8f6d80e924c497996 SHA1 89100bd1d5b061f56b5ae9d04cf79c93687c28f9 SHA256 6b8caaf3ed14969480beedbcbda086ac2a358ff955b839b394bd5b5f0f0397c1
-MD5 45296401b702a348ba7e02bbbab9a779 mkvtoolnix-1.7.0.ebuild 1568
-RMD160 2988488eafa60032b605fff8f6d80e924c497996 mkvtoolnix-1.7.0.ebuild 1568
-SHA256 6b8caaf3ed14969480beedbcbda086ac2a358ff955b839b394bd5b5f0f0397c1 mkvtoolnix-1.7.0.ebuild 1568
-MISC ChangeLog 8938 RMD160 3f3423ea4fd7713a9fb1f31c96e3f7cca0fd6c73 SHA1 042c0a5f85b1c679dc67d5055f7a2c44ba6e3628 SHA256 8f87c9f76a5aca0d468df393fa0767ad767ef259ada528b13831e0a1eb6201b8
-MD5 7e8aec03676da03455c8e0b875431e27 ChangeLog 8938
-RMD160 3f3423ea4fd7713a9fb1f31c96e3f7cca0fd6c73 ChangeLog 8938
-SHA256 8f87c9f76a5aca0d468df393fa0767ad767ef259ada528b13831e0a1eb6201b8 ChangeLog 8938
+EBUILD mkvtoolnix-1.7.0.ebuild 1383 RMD160 d64833aa33c5b1ec1cc4751d5fdff6fde71c78a5 SHA1 59f876c0b6c477c14e9bfecef824c1d38cadcedb SHA256 154c92d386861cf0f18090bba6f880a94e361936f863e6c1bfb2bbd3ccf55e9c
+MD5 b582f03f91d8290b5ac1356d8cf39f00 mkvtoolnix-1.7.0.ebuild 1383
+RMD160 d64833aa33c5b1ec1cc4751d5fdff6fde71c78a5 mkvtoolnix-1.7.0.ebuild 1383
+SHA256 154c92d386861cf0f18090bba6f880a94e361936f863e6c1bfb2bbd3ccf55e9c mkvtoolnix-1.7.0.ebuild 1383
+MISC ChangeLog 9058 RMD160 127364f2e12ec721072afac214ccd5bd00d6f4fa SHA1 fb0e0e7ff2f32139bdea0970b9b6a7107904bd25 SHA256 ce05cbd6509474f755ead1d983d5d6021ad15a4da95013fa18a5f1f9ae8cf21e
+MD5 ad351caa1be8b2319e04dacf8c997522 ChangeLog 9058
+RMD160 127364f2e12ec721072afac214ccd5bd00d6f4fa ChangeLog 9058
+SHA256 ce05cbd6509474f755ead1d983d5d6021ad15a4da95013fa18a5f1f9ae8cf21e ChangeLog 9058
MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 metadata.xml 253
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild
index 7c67a9f01f70..64da5c653676 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild,v 1.2 2006/09/07 22:06:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild,v 1.3 2006/09/07 22:44:21 beandog Exp $
-inherit eutils flag-o-matic
+inherit eutils wxwidgets flag-o-matic
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -25,13 +25,9 @@ DEPEND=">=dev-libs/libebml-0.7.7
lzo? ( dev-libs/lzo )"
pkg_setup() {
+ WX_GTK_VER="2.6"
if use wxwindows; then
- if ! built_with_use x11-libs/wxGTK X; then
- eerror "You must compile wxGTK with X useflag."
- die "Fix the USE flags on wxGTK and re-merge"
- fi
- # wxWidgets does not like --as-needed
- filter-ldflags -Wl,--as-needed --as-needed
+ need-wxwidgets gtk2
fi
}