| 1 |
radhermit 14/04/28 19:48:01 |
| 2 |
|
| 3 |
Modified: ChangeLog mkvtoolnix-6.9.1.ebuild |
| 4 |
Log: |
| 5 |
Add sys-devel/gettext to DEPEND (bug #508966) and drop ruby-ng eclass usage (fixes bug #508968). |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.202 media-video/mkvtoolnix/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.202&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.202&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?r1=1.201&r2=1.202 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v |
| 19 |
retrieving revision 1.201 |
| 20 |
retrieving revision 1.202 |
| 21 |
diff -u -r1.201 -r1.202 |
| 22 |
--- ChangeLog 26 Apr 2014 09:46:20 -0000 1.201 |
| 23 |
+++ ChangeLog 28 Apr 2014 19:48:01 -0000 1.202 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for media-video/mkvtoolnix |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.201 2014/04/26 09:46:20 radhermit Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.202 2014/04/28 19:48:01 radhermit Exp $ |
| 29 |
+ |
| 30 |
+ 28 Apr 2014; Tim Harder <radhermit@g.o> mkvtoolnix-6.9.1.ebuild: |
| 31 |
+ Add sys-devel/gettext to DEPEND (bug #508966) and drop ruby-ng eclass usage |
| 32 |
+ (fixes bug #508968). |
| 33 |
|
| 34 |
*mkvtoolnix-6.9.1 (26 Apr 2014) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: mkvtoolnix-6.9.1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- mkvtoolnix-6.9.1.ebuild 26 Apr 2014 09:46:21 -0000 1.1 |
| 52 |
+++ mkvtoolnix-6.9.1.ebuild 28 Apr 2014 19:48:01 -0000 1.2 |
| 53 |
@@ -1,13 +1,10 @@ |
| 54 |
# Copyright 1999-2014 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild,v 1.1 2014/04/26 09:46:21 radhermit Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild,v 1.2 2014/04/28 19:48:01 radhermit Exp $ |
| 58 |
|
| 59 |
EAPI=5 |
| 60 |
WX_GTK_VER="3.0" |
| 61 |
-USE_RUBY="ruby19 ruby20 ruby21" |
| 62 |
-# don't add ruby to RDEPEND |
| 63 |
-RUBY_OPTIONAL=yes |
| 64 |
-inherit eutils ruby-ng multilib toolchain-funcs versionator wxwidgets multiprocessing autotools |
| 65 |
+inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools |
| 66 |
|
| 67 |
DESCRIPTION="Tools to create, alter, and inspect Matroska files" |
| 68 |
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix" |
| 69 |
@@ -18,6 +15,17 @@ |
| 70 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 71 |
IUSE="debug pch qt5 wxwidgets" |
| 72 |
|
| 73 |
+ruby_atom() { |
| 74 |
+ local ruby_slot=${1/ruby/} |
| 75 |
+ ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}" |
| 76 |
+ echo "dev-lang/ruby:${ruby_slot}" |
| 77 |
+} |
| 78 |
+ |
| 79 |
+# hacks to avoid using the ruby eclasses since this requires something similar |
| 80 |
+# to the python-any-r1 eclass for ruby which currently doesn't exist |
| 81 |
+RUBY_IMPLS=( ruby19 ruby20 ruby21 ) |
| 82 |
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do echo $(ruby_atom ${ruby_impl}); done)" |
| 83 |
+ |
| 84 |
RDEPEND=" |
| 85 |
>=dev-libs/libebml-1.3.0:= |
| 86 |
>=media-libs/libmatroska-1.4.1:= |
| 87 |
@@ -36,13 +44,11 @@ |
| 88 |
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) |
| 89 |
" |
| 90 |
DEPEND="${RDEPEND} |
| 91 |
- || ( $(ruby_implementations_depend) ) |
| 92 |
+ || ( ${RUBY_BDEPS} ) |
| 93 |
+ sys-devel/gettext |
| 94 |
virtual/pkgconfig |
| 95 |
" |
| 96 |
|
| 97 |
-# workaround to override ruby-ng |
| 98 |
-S=${WORKDIR}/${P} |
| 99 |
- |
| 100 |
pkg_pretend() { |
| 101 |
# http://bugs.gentoo.org/419257 |
| 102 |
local ver=4.6 |
| 103 |
@@ -53,15 +59,16 @@ |
| 104 |
fi |
| 105 |
} |
| 106 |
|
| 107 |
-src_unpack() { |
| 108 |
- # workaround to override ruby-ng |
| 109 |
- default |
| 110 |
-} |
| 111 |
- |
| 112 |
src_prepare() { |
| 113 |
- # hack from ruby-ng eclass to determine ruby version to build with |
| 114 |
- local ruby_implementations=$(ruby_get_use_implementations) |
| 115 |
- export RUBY="$(ruby_implementation_command ${ruby_implementations[0]})" |
| 116 |
+ local ruby_impl |
| 117 |
+ for ruby_impl in "${RUBY_IMPLS[@]}"; do |
| 118 |
+ if has_version "$(ruby_atom ${ruby_impl})"; then |
| 119 |
+ export RUBY=${ruby_impl} |
| 120 |
+ break |
| 121 |
+ fi |
| 122 |
+ done |
| 123 |
+ |
| 124 |
+ [[ -z ${RUBY} ]] && die "No available ruby implementations to build with" |
| 125 |
|
| 126 |
epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \ |
| 127 |
"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch |
Archives