aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-01-19 19:29:54 -0800
committerGregory M. Tuner <gmt@be-evil.net>2014-01-19 19:29:54 -0800
commitaa73fee1ddda1e0fb379fd37ac5ba85c4458a2a9 (patch)
tree5a60a026e88f5ae60044280d07dbf3c2e8e41497 /media-libs/libmatroska
parentmedia-libs/libass: multilib-utize (diff)
downloadgmt-aa73fee1ddda1e0fb379fd37ac5ba85c4458a2a9.tar.gz
gmt-aa73fee1ddda1e0fb379fd37ac5ba85c4458a2a9.tar.bz2
gmt-aa73fee1ddda1e0fb379fd37ac5ba85c4458a2a9.zip
media-libs/libmatroska: multilib-utize
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'media-libs/libmatroska')
-rw-r--r--media-libs/libmatroska/Manifest2
-rw-r--r--media-libs/libmatroska/libmatroska-1.4.1-r1.ebuild26
2 files changed, 18 insertions, 10 deletions
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index fad949e..6d1f5ff 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,6 +1,6 @@
AUX libmatroska-1.0.0-respectflags.patch 453 SHA256 f13f7ddd44a12c1633b0ac287284f93b1bc9cf77b56c74c9c545a981e3e2382b SHA512 55e05f03c023b47b135ccc78f936966c53e7548c720d862d91868be329d2b66f6da99f78f4f1d517980a447b0739f31813a8506afa607b5bb4765c7e8b9c3a2a WHIRLPOOL 27abb433cebd9a30c1a321ac29da83e43eca2ee46d63e63bbd34e753e764af938ee35faca30d80a8710bc5b1f2c313e851f7f2a1dce0f239538f5f39fc35cdf5
AUX libmatroska-1.4.1-flags.patch 422 SHA256 a4c0e3965a6c0250bd4a40815c0dd46cd1de96b39ed2ce671c071b0b5d0f5e46 SHA512 e7ea48037b71dc8bac54a493aab6e2ad5f1bb7085556f80e4fda77e3b7fcfb579631f76126fb546850f66f013d74f0e58f54174e50b6ed0bf89a814dc61ee4db WHIRLPOOL 955b370d843110fddc23be23330b84e330a0960f656723db5c8b095b889ce1e3448078a31d7e4cffa7e0a4e558a8985adeffa22fd30bd2cbad635810bc3a0e54
DIST libmatroska-1.4.1.tar.gz 97741 SHA256 7b735212106bcc53e90bda8ed5d575c4a3ad0816689589bb1641c812e020dd15 SHA512 efaf959c50886acefa83c9f371ea556658703898d606c2af0fa75ebfb504eb592f2d7b2f641ed776db297187429de3c8b0cda685d0bbb3469a11683ff0547fd8 WHIRLPOOL 694034d20aa9fecfab923f3109ec56645969cbce2cd5450acca8483a46d0ec3e721d555833e0524d82935d993fc49f6c385d9c5daedd90cedd9d6bf4fb1a1c68
-EBUILD libmatroska-1.4.1-r1.ebuild 1431 SHA256 4d687ed3a2872547c2d41d42972d224f28f51ebd8a735a89e36783b3ea8ae8a1 SHA512 eefa78dc993dd1c23df300177d41bebfb36e1bd68c8adccc686a4d0704a5bce49f77636aba505890a4da6d375b9f36ff616448f217edfd3e78852374b45316f7 WHIRLPOOL d8dc6d8785310cdc461fcd15ae5ac0bccad549c9d3829d9bf73c61031b724b510fa088721ca9962f06710853d710178b07dab1977e749e2972205c567d38645e
+EBUILD libmatroska-1.4.1-r1.ebuild 1492 SHA256 93054e253250d185d1a0d583ff865e6abc39731d1c0d200ec6446d34fb2f19a0 SHA512 59829f5a5e366a4f07e617bef9c6eff821f28696032e5befee925b946e13901668d48613f9a3f795faf2bbc8672f55620192c8434cb2305bee8190a19d894c0c WHIRLPOOL a56d438b68b571e909d689b757ad8453940e41c2530535d80353f807528bbd22249fe388650800f617421802aa50ed171a481646f54063ac3577b5366c43656d
MISC ChangeLog 15200 SHA256 e159681b9826c1283aac8e979c13c1b33e04d859dab07d2dae3ea7cf35565511 SHA512 46db6b587b13e042b4cb26aff9e5a88640a4d00c910eec694fc8b7910d2a7e98ac7f7a26e27fe6e23c6a2275f74df299cb2aa3d5255b0a54068b01c3f13a1b20 WHIRLPOOL 8267cb7656a6990526fd365f1842952a0e928e80a0fd0214b36da8ae848ee284f47f2aa2c51d1a6592e0d1a3b3f2163834f2e5fa27fae873e726069e85f5995b
MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c
diff --git a/media-libs/libmatroska/libmatroska-1.4.1-r1.ebuild b/media-libs/libmatroska/libmatroska-1.4.1-r1.ebuild
index ef38677..a3bf00e 100644
--- a/media-libs/libmatroska/libmatroska-1.4.1-r1.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit flag-o-matic eutils multilib toolchain-funcs
+inherit flag-o-matic eutils multilib toolchain-funcs multilib-minimal
DESCRIPTION="Extensible multimedia container format based on EBML"
HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
@@ -12,20 +12,24 @@ SRC_URI="https://github.com/Matroska-Org/libmatroska/archive/release-${PV}.tar.g
LICENSE="GPL-2"
SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~amd64"
IUSE="static-libs"
RESTRICT="test"
-DEPEND=">=dev-libs/libebml-1.3.0:="
+DEPEND=">=dev-libs/libebml-1.3.0:=[${MULTILIB_USEDEP}]"
RDEPEND="${DEPEND}"
-S=${WORKDIR}/${PN}-release-${PV}/make/linux
+S=${WORKDIR}/${PN}-release-${PV}
src_prepare() {
+ cd make/linux
epatch "${FILESDIR}"/${P}-flags.patch
+ cd ../..
+ multilib_copy_sources
}
-src_compile() {
+multilib_src_compile() {
+ cd make/linux
local targets="sharedlib"
use static-libs && targets+=" staticlib"
@@ -35,15 +39,19 @@ src_compile() {
emake PREFIX="${EPREFIX}"/usr \
LIBEBML_INCLUDE_DIR="${EPREFIX}"/usr/include/ebml \
LIBEBML_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
+ CXX="${CXX:-$(tc-getCXX)}" \
+ AR="${AR:-$(tc-getAR)}" \
${targets}
}
-src_install() {
+multilib_src_install() {
+ cd make/linux
local targets="install_sharedlib install_headers"
use static-libs && targets+=" install_staticlib"
emake DESTDIR="${D}" prefix="${EPREFIX}"/usr libdir="${EPREFIX}"/usr/$(get_libdir) ${targets}
- dodoc "${WORKDIR}"/${PN}-release-${PV}/ChangeLog
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog
}