media-libs/libdvbpsi: multilib-utize

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 32 insertions, 15 deletions

diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index c62eefc..0eb291d 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,6 +1,6 @@
 DIST libdvbpsi-0.2.2.tar.bz2 330403 SHA256 9aa62345c8fed04a4f59524967fb154e3f9b02625666a200861555dcb9163ed3 SHA512 9077a87d31b6c142773d68a5679a5b864df1c063f66d8b405964127b5e2f0b6b8ab4c1c003f873c221ba5657022667bfdb19cc399211be52bbc94a227de262a7 WHIRLPOOL e7fd34d5e4217a6f0b8d854c39810b48e9d31b49594185ad0c19c78c24681387b3691da7c1810467a0e630590c91f553d74a18269569735c347338effe3cb671
 DIST libdvbpsi-1.1.0.tar.bz2 443464 SHA256 c02ca4a9159b540955ddb8183f08292a94bdf6b95800161e9e8eff777e552380 SHA512 1302eeb5310db5ed0f979b46aa972f6cbca9f76c2ce40fa418ed904b63651bf5ceda2c2472772e7c1c919dc6cb1ea1892e795b7cdb237f28aafb0d692a3d1d7e WHIRLPOOL acdc55e18b90945df95f296cbdde5f68c79dca752e50860e41a45c3504f49933b0de3d30f71039649d476209618d37ebc246a01fb589b78db6f2979bacf89d2a
-EBUILD libdvbpsi-0.2.2-r1.ebuild 923 SHA256 be0a6dcb2b578877b098b09da66935227122d68e54dd9761ba0d0e6b57c5defc SHA512 600eab68129881e994edfc5b4155bf8981edaaf85accdd504b484cc9db59ea65030dd15c8e206bf925454daed138802ece8163055bf9e0bc41aaec1fa00495cc WHIRLPOOL cd8c95b05c6a3b79014e64104383a4059f56d6cdf3a860ae9b9d10a550ffd47fd3634b09e8cc2b06645b3eeee1d2d1ebb9c563d0af6367633e48e4449f3910c2
-EBUILD libdvbpsi-1.1.0-r1.ebuild 997 SHA256 4b5f9253958adf2245e1858ffb1d4b02a2da5c195c5c4bfe8b956860acdeedd3 SHA512 a679afeefc105a2cd419239bf94927ce838cc86f5cdf0ea593d80b35c31a0cf36ac6238cc0d4aa0d61b615e0f8589f6c6508e834020032be86d03e73bba4a808 WHIRLPOOL e0682e39c8534ce6e3704c2c8165c647bb59d316f190ab88425cba4bbc54118e881f09aff270a879a4bae7d42c0f3610b138791b2ad1d970d306fa187cf2b442
+EBUILD libdvbpsi-0.2.2-r1.ebuild 1148 SHA256 6ed5531ebf2cf0903e8d1648ad71697e79538a002f65a323e35e5ffce05279e8 SHA512 f91a1aca95656ef782e0354ced70a73a6b28a7eafe436aaaf2c42794e88c0d77bf47334daae810acb8407778e301ae704aa1733b4d86e0b14cd930d73b3acb56 WHIRLPOOL 4bf1441c0b96c2c795f88a998c82f227445b76b54a08aa5b4175817b49df0f993286c226dc3704d6731a52219df9fad3c0628aad6bbc9148e78a9a2c26071fc2
+EBUILD libdvbpsi-1.1.0-r1.ebuild 1168 SHA256 2b18463c1eea5f8fc2f19bf98af07ec64f1f7732741cbee532524e69ee1ba4d6 SHA512 40d85e7093579baf4877520bc409d42316ad021ce245bb8319b0497381694b8483bd5966e93dfcc8853489b877e823e70dd2bf081e3d9885786148dff3314dec WHIRLPOOL 3b44737c131028eac4eb4cc5e80701b995cddf86f52c91a45178b67b38a0bd37151aa52f07c2b3ac19a17b58f0ac5d744300810b524597247d7ef9509bac4c3f
 MISC ChangeLog 8101 SHA256 ab266cc65173543965f18f85aa5184bead5f0fe78c17b3db10e9d2992bd0a886 SHA512 96db5beb96eb55f4dc14235425c98e207377e67e8480768a95d87a7dbf8a0511e57f876c6b96fc1a3dccd0c064966dd136a353b8075a4dd4536a48c3a8e18614 WHIRLPOOL a4eede51194289109f16f6fbfd91b01155e3c56ee222051fe8ed83c7a42cc1bb86f3a497f37d169905a3a30859b7e1c5730e21fe30c339be8ee17882a21bb057
 MISC metadata.xml 220 SHA256 2356fe6e618f7034ca8cb3c804d7c4deb01252923d4935d311a599b38a8ac69d SHA512 11887006742f5262b96ea78a744d514f7be4a6a6ad87ca559c9cf50064ecc3595c491a0560048488bdd55f8c893dc98c47bcf58bfc8095fe2e36fa0b4bc0cba8 WHIRLPOOL 4dc0d924816d068d26f95efd1a66735fdc9eb5f8c0347aad7a169978fbee2a26fcb04d6995a982ba1dbab7b9cb80a3431c81cf7d40f890e823f29e67bce36ab4
diff --git a/media-libs/libdvbpsi/libdvbpsi-0.2.2-r1.ebuild b/media-libs/libdvbpsi/libdvbpsi-0.2.2-r1.ebuild
index df893b6..f53a06c 100644
--- a/media-libs/libdvbpsi/libdvbpsi-0.2.2-r1.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-0.2.2-r1.ebuild
@@ -4,13 +4,15 @@
 
 EAPI=4
 
+inherit multilib-minimal
+
 DESCRIPTION="library for MPEG TS/DVB PSI tables decoding and generation"
 HOMEPAGE="http://www.videolan.org/libdvbpsi"
 SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64"
 IUSE="doc static-libs"
 
 RDEPEND=""
@@ -20,25 +22,34 @@ DEPEND="
 		>=media-gfx/graphviz-2.26
 	)" # Require recent enough graphviz wrt #181147
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
 src_prepare() {
 	sed -e '/CFLAGS/s:-O2::' -e '/CFLAGS/s:-O6::' -i configure || die
 }
 
-src_configure() {
-	econf \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable static-libs static) \
 		--enable-release
+	if multilib_is_best_abi && use doc; then
+		info cloning doc tree...
+		cp -av "${S}"/doc .
+	fi
 }
 
-src_compile() {
+multilib_src_compile() {
 	emake
-	use doc && emake doc
+	multilib_is_best_abi && use doc && \
+		emake doc
 }
 
-src_install() {
+multilib_src_install() {
 	default
-	use doc && dohtml doc/doxygen/html/*
+	multilib_is_best_abi && use doc && \
+		dohtml doc/doxygen/html/*
+}
+
+multilib_src_install_all() {
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+	dodoc "${DOCS[@]}"
 	rm -f "${ED}"usr/lib*/${PN}.la
 }
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.1.0-r1.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.1.0-r1.ebuild
index 85e4879..3beb0f1 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.1.0-r1.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.1.0-r1.ebuild
@@ -22,8 +22,6 @@ DEPEND="
 		>=media-gfx/graphviz-2.26
 	)" # Require recent enough graphviz wrt #181147
 
-DOCS=( AUTHORS ChangeLog NEWS README )
-
 src_prepare() {
 	sed -e '/CFLAGS/s:-O2::' -e '/CFLAGS/s:-O6::' -e '/CFLAGS/s:-Werror::' -i configure || die
 }
@@ -32,18 +30,26 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable static-libs static) \
 		--enable-release
+	if multilib_is_best_abi && use doc; then
+		info cloning doc tree...
+		cp -av "${S}"/doc .
+	fi
 }
 
 multilib_src_compile() {
 	emake
-	use doc && emake doc
+	multilib_is_best_abi && use doc && \
+		emake doc
 }
 
 multilib_src_install() {
 	default
-	use doc && dohtml doc/doxygen/html/*
+	multilib_is_best_abi && use doc && \
+		dohtml doc/doxygen/html/*
 }
 
 multilib_src_install_all() {
+	DOCS=( AUTHORS ChangeLog NEWS README )
+	dodoc "${DOCS[@]}"
 	rm -f "${ED}"usr/lib*/${PN}.la
 }