get_libdir fixes. Removing broke version.

4 files changed, 14 insertions, 60 deletions

diff --git a/media-libs/id3lib/ChangeLog b/media-libs/id3lib/ChangeLog
index 14133e182bcc..4ee81fbbc7c8 100644
--- a/media-libs/id3lib/ChangeLog
+++ b/media-libs/id3lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/id3lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.28 2004/09/13 02:18:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.29 2004/10/05 10:32:29 eradicator Exp $
+
+  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -id3lib-3.8.3-r2.ebuild:
+  get_libdir fixes.  Removing broke version.
 
 *id3lib-3.8.3-r3 (12 Sep 2004)
 
diff --git a/media-libs/id3lib/files/digest-id3lib-3.8.3-r2 b/media-libs/id3lib/files/digest-id3lib-3.8.3-r2
deleted file mode 100644
index cfb850ce9d1e..000000000000
--- a/media-libs/id3lib/files/digest-id3lib-3.8.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19f27ddd2dda4b2d26a559a4f0f402a7 id3lib-3.8.3.tar.gz 950726
diff --git a/media-libs/id3lib/id3lib-3.8.3-r2.ebuild b/media-libs/id3lib/id3lib-3.8.3-r2.ebuild
deleted file mode 100644
index fb825ac25d6d..000000000000
--- a/media-libs/id3lib/id3lib-3.8.3-r2.ebuild
+++ /dev/null
@@ -1,52 +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/id3lib/id3lib-3.8.3-r2.ebuild,v 1.6 2004/08/19 22:51:03 pvdabeel Exp $
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Id3 library for C/C++"
-HOMEPAGE="http://id3lib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ~ia64 ppc64"
-IUSE="doc"
-
-RDEPEND="virtual/libc"
-DEPEND="sys-devel/autoconf
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	export WANT_AUTOMAKE=1.6
-	export WANT_AUTOCONF=2.5
-
-	libtoolize --force --copy || die
-	aclocal || die
-	automake || die
-	autoconf || die
-}
-
-src_compile() {
-	export CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "Install failed"
-	dosym /usr/lib/libid3-3.8.so.3 /usr/lib/libid3-3.8.so.0.0.0
-	dosym /usr/lib/libid3-3.8.so.0.0.0 /usr/lib/libid3-3.8.so.0
-
-	dodoc AUTHORS ChangeLog HISTORY INSTALL README THANKS TODO
-
-	# some example programs to be placed in docs dir.
-	if use doc; then
-		cp -a examples ${D}/usr/share/doc/${PF}/examples
-		cd ${D}/usr/share/doc/${PF}/examples
-		make distclean
-	fi
-}
diff --git a/media-libs/id3lib/id3lib-3.8.3-r3.ebuild b/media-libs/id3lib/id3lib-3.8.3-r3.ebuild
index c2dc1e43f773..5ac45613bd05 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r3.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r3.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r3.ebuild,v 1.2 2004/09/15 18:01:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r3.ebuild,v 1.3 2004/10/05 10:32:29 eradicator Exp $
+
+IUSE="doc"
 
 inherit eutils
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Id3 library for C/C++"
 HOMEPAGE="http://id3lib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
@@ -13,10 +16,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64 ppc64"
-IUSE="doc"
 
 RDEPEND="sys-libs/zlib"
-DEPEND="sys-devel/autoconf
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
 	sys-devel/libtool"
 
 src_unpack() {
@@ -41,9 +44,9 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Install failed"
-	dosym /usr/lib/libid3-3.8.so.3 /usr/lib/libid3-3.8.so.0.0.0
-	dosym /usr/lib/libid3-3.8.so.0.0.0 /usr/lib/libid3-3.8.so.0
+	make DESTDIR="${D}" install || die "Install failed"
+	dosym /usr/$(get_libdir)/libid3-3.8.so.3 /usr/$(get_libdir)/libid3-3.8.so.0.0.0
+	dosym /usr/$(get_libdir)/libid3-3.8.so.0.0.0 /usr/$(get_libdir)/libid3-3.8.so.0
 
 	dodoc AUTHORS ChangeLog HISTORY INSTALL README THANKS TODO