summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2012-09-06 04:14:53 +0000
committerChristoph Junghans <ottxor@gentoo.org>2012-09-06 04:14:53 +0000
commit2421087ec87770f315bc702b47952fc5cf6f075a (patch)
tree609e83fcbf968b14618bf3a926965f9eb594e506 /media-libs
parentKeyword ~arm, bug #389113 (diff)
downloadgentoo-2-2421087ec87770f315bc702b47952fc5cf6f075a.tar.gz
gentoo-2-2421087ec87770f315bc702b47952fc5cf6f075a.tar.bz2
gentoo-2-2421087ec87770f315bc702b47952fc5cf6f075a.zip
added ~x86-linux
(Portage version: 2.2.0_alpha124/cvs/Linux i686)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libmatroska/ChangeLog5
-rw-r--r--media-libs/libmatroska/libmatroska-1.3.0.ebuild12
2 files changed, 10 insertions, 7 deletions
diff --git a/media-libs/libmatroska/ChangeLog b/media-libs/libmatroska/ChangeLog
index d3d1bcd33cd3..72545d7cfee7 100644
--- a/media-libs/libmatroska/ChangeLog
+++ b/media-libs/libmatroska/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libmatroska
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.107 2012/08/19 15:56:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.108 2012/09/06 04:14:53 ottxor Exp $
+
+ 06 Sep 2012; Christoph Junghans <ottxor@gentoo.org> libmatroska-1.3.0.ebuild:
+ added ~x86-linux
19 Aug 2012; Raúl Porcel <armin76@gentoo.org> libmatroska-1.3.0.ebuild:
alpha/arm/ia64/sparc stable wrt #423129
diff --git a/media-libs/libmatroska/libmatroska-1.3.0.ebuild b/media-libs/libmatroska/libmatroska-1.3.0.ebuild
index 3769be045e5c..51a79e20da85 100644
--- a/media-libs/libmatroska/libmatroska-1.3.0.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-1.3.0.ebuild,v 1.8 2012/08/19 15:56:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-1.3.0.ebuild,v 1.9 2012/09/06 04:14:53 ottxor Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="static-libs"
RESTRICT="test"
@@ -32,9 +32,9 @@ src_compile() {
#fixes locale for gcc3.4.0 to close bug 52385
append-flags $(test-flags -finput-charset=ISO8859-15)
- emake PREFIX=/usr \
- LIBEBML_INCLUDE_DIR=/usr/include/ebml \
- LIBEBML_LIB_DIR=/usr/$(get_libdir) \
+ emake PREFIX="${EPREFIX}"/usr \
+ LIBEBML_INCLUDE_DIR="${EPREFIX}"/usr/include/ebml \
+ LIBEBML_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) \
CXX="$(tc-getCXX)" \
AR="$(tc-getAR)" \
${targets}
@@ -44,6 +44,6 @@ src_install() {
local targets="install_sharedlib install_headers"
use static-libs && targets+=" install_staticlib"
- emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" ${targets}
+ emake prefix="${ED}/usr" libdir="${ED}/usr/$(get_libdir)" ${targets}
dodoc "${WORKDIR}/${P}/ChangeLog"
}