don't install 64bit libs into /usr/lib32

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

3 files changed, 87 insertions, 15 deletions

diff --git a/media-libs/dumb/ChangeLog b/media-libs/dumb/ChangeLog
index 10e2ef87b0d5..d0d028baf645 100644
--- a/media-libs/dumb/ChangeLog
+++ b/media-libs/dumb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/dumb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.45 2014/03/06 10:45:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.46 2014/03/11 14:31:38 hasufell Exp $
+
+*dumb-0.9.3-r3 (11 Mar 2014)
+
+  11 Mar 2014; Julian Ospald <hasufell@gentoo.org> +dumb-0.9.3-r3.ebuild:
+  don't install 64bit libs into /usr/lib32
 
   06 Mar 2014; Agostino Sarubbo <ago@gentoo.org> dumb-0.9.3-r2.ebuild:
   Stable for ppc64, wrt bug #495710
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index cbed64afe45b..945c6bbb54b9 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -6,22 +6,25 @@ AUX dumb-0.9.3_CVE-2006-3668.patch 637 SHA256 9f6785435757db725bc73b1c4874b91e80
 DIST dumb-0.9.3.tar.gz 167379 SHA256 8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33 SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658 WHIRLPOOL c5139d6d845245fc60a9984064b5bf9b0cb54e0499ddd55db56ca5faa31ebc6158b486b70409dc6068c8261330e9200c84c278e19c9fa16bf32b67c403f44e9b
 EBUILD dumb-0.9.3-r1.ebuild 2101 SHA256 0a572ab4f55008701f61b7dabb61494fe6eeb21ca1b9e3aae020ef70c27d012d SHA512 8b3f89d5d4be5075f462bb763d634af884002afee58a21a02d8c7cce6e00990c47f6cba6ab971295ea117016e88b57ab0db9916d2455f4048c40181944a9fa2f WHIRLPOOL 3f6191a6ed771c8651499c51679d3cf6285ffc54efc2f5d943797f7a117da888573c30d0ae599ae2999f7198919f022d5a820b3f71fcb11c38939017f6e5854c
 EBUILD dumb-0.9.3-r2.ebuild 2021 SHA256 c568476934bda2ca1adb0d18972e312e6fa76bf8619c22473917af1ac01204a5 SHA512 d221b20d0683929cf5cf251ff63516881565b5c2b1bb9bbedcc1e71b40fc0c459aa61b47fec7654069344ccdd85f6ac829a94cfe6b4226abde3f64468f80df99 WHIRLPOOL 47ed6188635474a7778d72342ad4d293e865e6de4f9709129c3c293e6b718a17117368a2828a062d91c90d632e4aa2bf83aacff4507dd85340ff900720596550
-MISC ChangeLog 6049 SHA256 6c3b18443d8e47b3afb34ee2e221ed8a4af50dfa2674f3df6ee24f25eb0691c9 SHA512 be73f289a61ce747dbfd6673ba2cb0336c8bfa20546b7445e54685f76a409bf11391b66b537f5ae840d64b3d87398e1a4d4a44cee7ac036fbee9c74e88be9cf7 WHIRLPOOL aef391c533aaa88e711320728882de86e1cc1b4bf80d3d3cc67c073be15a80485bbab2ae4c168994201e4a87ca3513adb189a8e2c65dfb2531f23cdc22c6d859
+EBUILD dumb-0.9.3-r3.ebuild 2064 SHA256 f88b700d8fdb13d42aa0ff8123ed6512df9c12f23753df6e5a8a0eede7b78c7f SHA512 668bd67e50717e077cce766f90a9d2bb705ec68a4f95112bf04d67984152a9115677799b3f5a7b737b8ef82f457b05f608ade238e251eb0afb7a119d81ec699f WHIRLPOOL 112195919022ddb57315337a99df53f52650e81bba694833c4b919c14a04202610585bd9cf4e6c4cb958f06cf9e54522942ab4409f3d3f399786d382a7f28b5b
+MISC ChangeLog 6202 SHA256 1f7dc72c160b1dbbdfa379b612f6ed1a8e3912c30e18486677088ce5750120a4 SHA512 b3d89d6c046be2855f0dde4b98b10cfb71f8c9e1b5d1c135b1cd68297d7a1400e64d7e3d7afb74ce4f56dcee56299b1e4efe1f8b1408f2cad9c5ebab2632227e WHIRLPOOL 5773684835327f9cc7bfdc8f07f76669c09fc3e692775940971e876d2411629e96d61c5e21145d0d10b8d036423d74b8b439f19d7d988f15d5a2f02ef90deab6
 MISC metadata.xml 251 SHA256 c6bc54aeb1244159055765e01a1d89c4bf47fa956a3e065de5f4d4b7b24a6753 SHA512 5eca20f204822ed2e24c57d5eb11955edf85316b475c0c760bef6ead9786d994c9c2f1fe6d1ce6a514cfe5698195b51ea575ad6010ea355bfc51b0df519c5cd0 WHIRLPOOL 27e1147deb5067fc75dd8c619ad183dad1c07355e9dcac48d84ad9148781da267029feea75754bd5810353803322cb05a1eee61066970d58fe2937e114f64156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTGFGxAAoJELp701BxlEWff2kQAJD4HmMLuhw1ZzwFAOI5W28U
-CyuyHwHxO/20qJPCf5jI5rOB2n5ZH3XXPsWka66rBQG54OX4MUTdit3CctqKnfcv
-FDcPXHlRPRtTxuTjZrd0AbOd5g3GogPqATMqKK/qEuINg+o4c9UqAaIIRsB71pwC
-NtCkEGsIfbWfKILgvizMqSQW/KuTNGm3xaO7GytkFB2REGar/CUzBjUkDJZoydkC
-WBc1pH2Xu/FjDsRbKOgu466J6nRKmUNh0Z6SoNQOo9YDI97nH9nvSaSufFASZTT3
-Hqxx0o1Ky/kEhx5KRhT4KzzTgLqe/+QlseisZ1SKA2BA/2wbGoMuBMk7TTwgkzHW
-qczmrnLBs0UsUWmtUunx5wWfqbzEjUV1Vq3tIHFNFLHUi2m0/JaELM73IFsLPWI6
-kOPWoS+79a/N4mhkpyDTt9ZW8Hq9xuAGV45ekr4SeVcpJhft2UZpwJtoYQPu9JQs
-te/e25FlFvS/xM713eqWq0Ee42FI89IkBpFpPeJ8iJoF2CXjs0iPWZXTx2lTrbQ6
-gBTg5VmHIaeObWnZGd3o0w5MumkJ0b7v2hesbR2picIHk5AdHV4/AVhii0UgpQhI
-+FxUD1MWHiGWqkIXODdKVrnf7MGlneFenazQ0HWR2gExVlvxKxNqu1yLicJPT3DG
-Lcy2wXLZ5dE0/+H9m1OZ
-=lmBM
+iQJ8BAEBCABmBQJTHx5MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg+R0P/iQlEftXZiulv7ForPHwW6Fp
+VseIVdU0l+/yYjKngs+4ntylMMuoG/MN0PtfSKcH3pHljstyM6hUZU686Jsdl258
+RZnNUSDAXMLRs12v3Dtpl0dl31JpcBJteyvP7UZjdXR9gSxANBlffbT8w758kEw3
+QiBU3dyZB81GDl5re2ZNUxFck42WlFxQouunnGnSEgzQV1/Fdsze0JKTDo6+59IJ
+iTHBmQV+g/99JDyT3k7Y00gsiiYjOvcSl8+grbpWkA/dc896AMIWw8dvhcvSabs3
+rkeJtCyTSarHSlg8sjyawpG58rM84k21tEyh58SUVJjToO9NmUKaILoeCWXjOKsZ
+GQeb4aMsgRxk/94JdNkUVBvML8/tU6OnNnHDst2hX332UNJKkl3iVgcuO7S7y8F4
+ka+sKl/IcyhBR0/e0SdLntYIXDnAMYBfcSZzU6SJqTN9WCACpPtCrmUwbmeCBsB1
+FeHl24i6TB4Jey0Ek1pWqWa+lmQ1tRNZejw0aY7jn5XdOgEK22xo22mDa5Nuf1//
+uHYfn1JqKfzSIqzG0ONt9kQNqc0+iJf88jZjSi60+2jIpkdZuv7yZRlVdmCfz3q2
+zPxsz6NkBrzMBPfHDGmN5azUtP7K+H4/L8AniHiheNhjamvdrZ7r8oSwj9Yf8LeZ
+CN73CGpXn/jKyy/aKqzO
+=QX4X
 -----END PGP SIGNATURE-----
diff --git a/media-libs/dumb/dumb-0.9.3-r3.ebuild b/media-libs/dumb/dumb-0.9.3-r3.ebuild
new file mode 100644
index 000000000000..e76d9cb81b99
--- /dev/null
+++ b/media-libs/dumb/dumb-0.9.3-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.3-r3.ebuild,v 1.1 2014/03/11 14:31:38 hasufell Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs multilib-build multilib-minimal
+
+DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters"
+HOMEPAGE="http://dumb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dumb/${P}.tar.gz"
+
+LICENSE="DUMB-0.9.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	cat << EOF > make/config.txt
+include make/unix.inc
+ALL_TARGETS := core core-examples core-headers
+PREFIX := /usr
+EOF
+
+	epatch "${FILESDIR}"/${P}-PIC-as-needed.patch
+	epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch
+	sed -i '/= -s/d' Makefile || die "sed failed"
+	cp -f Makefile Makefile.rdy
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake CC="$(tc-getCC)" OFLAGS="${CFLAGS}" all
+}
+
+multilib_src_install() {
+	dolib.so lib/unix/libdumb.so
+	use debug && dolib.so lib/unix/libdumbd.so
+
+	doheader include/dumb.h
+
+	dobin examples/{dumbout,dumb2wav}
+	dodoc readme.txt release.txt docs/*
+}
+
+pkg_postinst() {
+	elog "DUMB's core has been installed. This will enable you to convert module"
+	elog "files to PCM data (ready for sending to /dev/dsp, writing to a .wav"
+	elog "file, piping through oggenc, etc.)."
+	elog
+	elog "If you are using Allegro, you will also want to 'emerge aldumb'. This"
+	elog "provides you with a convenient API for playing module files through"
+	elog "Allegro's sound system, and also enables DUMB to integrate with"
+	elog "Allegro's datafile system so you can add modules to datafiles."
+	elog
+	elog "As a developer, when you distribute your game and write your docs, be"
+	elog "aware that 'dumb' and 'aldumb' actually come from the same download."
+	elog "People who don't use Gentoo will only have to download and install one"
+	elog "package. See readme.txt in /usr/share/doc/${PF} for details on"
+	elog "how DUMB would be compiled manually."
+}