Properly install debug version of the library, as demonstrated by Ciaran Hamilton <gentoo-bugs@theblob.org> in bug #106309. Clean out old ebuilds.

(Portage version: 2.0.53_rc5)

6 files changed, 31 insertions, 42 deletions

diff --git a/media-libs/dumb/ChangeLog b/media-libs/dumb/ChangeLog
index 5bd9110e0e57..d0c91716e484 100644
--- a/media-libs/dumb/ChangeLog
+++ b/media-libs/dumb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/dumb
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.14 2005/09/13 18:34:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.15 2005/10/18 22:03:17 chainsaw Exp $
+
+*dumb-0.9.2-r3 (18 Oct 2005)
+
+  18 Oct 2005; Tony Vroon <chainsaw@gentoo.org> -dumb-0.9.1.ebuild,
+  -dumb-0.9.2-r1.ebuild, +dumb-0.9.2-r3.ebuild:
+  Properly install debug version of the library, as demonstrated by Ciaran
+  Hamilton <gentoo-bugs@theblob.org> in bug #106309. Clean out old ebuilds.
 
   13 Sep 2005; Aron Griffis <agriffis@gentoo.org> dumb-0.9.2-r2.ebuild:
   Mark 0.9.2-r2 stable on alpha
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index e275e4353796..d5f861c565ed 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -1,9 +1,11 @@
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 78b3f757be0bec999e6aec4392b73519 dumb-0.9.1.ebuild 738
 MD5 bca4b87f0eee7de5304c5a13b97ae184 ChangeLog 1781
-MD5 8948ac5e4a3b617601b8ef05eacbbc53 dumb-0.9.2-r2.ebuild 1906
+MD5 78b3f757be0bec999e6aec4392b73519 dumb-0.9.1.ebuild 738
 MD5 77bc9197031b343f29a24f43b7dbbe37 dumb-0.9.2-r1.ebuild 1811
-MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-dumb-0.9.2-r2 68
+MD5 8948ac5e4a3b617601b8ef05eacbbc53 dumb-0.9.2-r2.ebuild 1906
+MD5 d35262fdc8603472d463e38ebab42de3 dumb-0.9.2-r3.ebuild 1920
+MD5 e8a7336fec185fa94008e2b1599c697c files/digest-dumb-0.9.1 62
 MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-dumb-0.9.2-r1 68
+MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-dumb-0.9.2-r2 68
+MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-dumb-0.9.2-r3 68
 MD5 06b0308865a7fa48b3f9c75937a4c9e4 files/dumb-0.9.2-PIC.patch 2697
-MD5 e8a7336fec185fa94008e2b1599c697c files/digest-dumb-0.9.1 62
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
diff --git a/media-libs/dumb/dumb-0.9.1.ebuild b/media-libs/dumb/dumb-0.9.1.ebuild
deleted file mode 100644
index b82fbdf3637a..000000000000
--- a/media-libs/dumb/dumb-0.9.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.1.ebuild,v 1.5 2004/07/14 19:19:33 agriffis Exp $
-
-DESCRIPTION="IT, XM, S3M and MOD player library"
-SRC_URI="mirror://sourceforge/dumb/${P}.tar.gz"
-HOMEPAGE="http://dumb.sourceforge.net/"
-
-LICENSE="DUMB"
-SLOT="0"
-KEYWORDS="x86 ~alpha ~ia64"
-IUSE=""
-
-RDEPEND="media-libs/allegro"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	make -f make/makefile.uni OFLAGS="${CFLAGS}" all || die
-}
-
-src_install() {
-	dodir /usr/lib /usr/include
-	make -f make/makefile.uni install PREFIX=${D}/usr || die
-
-	dodoc readme.txt release.txt docs/*
-	insinto /usr/share/${PN}
-	doins examples/*.{c,ini}
-}
diff --git a/media-libs/dumb/dumb-0.9.2-r1.ebuild b/media-libs/dumb/dumb-0.9.2-r3.ebuild
index b8067b167a4d..d2ad574a578b 100644
--- a/media-libs/dumb/dumb-0.9.2-r1.ebuild
+++ b/media-libs/dumb/dumb-0.9.2-r3.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.2-r1.ebuild,v 1.7 2004/07/13 08:13:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.2-r3.ebuild,v 1.1 2005/10/18 22:03:17 chainsaw Exp $
 
-IUSE=""
+IUSE="debug"
+
+inherit eutils
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters"
 HOMEPAGE="http://dumb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dumb/${P}-fixed.tar.gz"
 
-KEYWORDS="x86 ~ppc ~alpha ~ia64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 LICENSE="DUMB-0.9.2"
 SLOT="0"
 
@@ -23,6 +25,8 @@ include make/unix.inc
 ALL_TARGETS := core core-examples core-headers
 PREFIX := /usr
 EOF
+
+	epatch ${FILESDIR}/${P}-PIC.patch
 }
 
 src_compile() {
@@ -30,8 +34,14 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/lib /usr/include /usr/bin
-	make PREFIX="${D}/usr" install || die "make install failed"
+	dobin examples/dumbout
+	dolib.so lib/unix/libdumb.so
+
+	use debug && dolib.so lib/unix/libdumbd.so
+
+	insinto /usr/include
+	doins include/dumb.h
+
 	dodoc readme.txt release.txt docs/* || die "dodoc failed"
 }
 
diff --git a/media-libs/dumb/files/digest-dumb-0.9.1 b/media-libs/dumb/files/digest-dumb-0.9.1
deleted file mode 100644
index 3fb46dbe0f6b..000000000000
--- a/media-libs/dumb/files/digest-dumb-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf8a8cc3af4c5f6700b812b69a7cbb35 dumb-0.9.1.tar.gz 132398
diff --git a/media-libs/dumb/files/digest-dumb-0.9.2-r1 b/media-libs/dumb/files/digest-dumb-0.9.2-r3
index 575391fbac0a..575391fbac0a 100644
--- a/media-libs/dumb/files/digest-dumb-0.9.2-r1
+++ b/media-libs/dumb/files/digest-dumb-0.9.2-r3