Dropped old versions. Cleaned up the ebuild.

(Portage version: 2.1.2_rc2)

4 files changed, 37 insertions, 26 deletions

diff --git a/dev-util/libconf/ChangeLog b/dev-util/libconf/ChangeLog
index a0bf879d92af..fac4597c7ddb 100644
--- a/dev-util/libconf/ChangeLog
+++ b/dev-util/libconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/libconf
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/ChangeLog,v 1.41 2006/06/07 21:10:21 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/ChangeLog,v 1.42 2006/11/28 20:06:20 dev-zero Exp $
+
+  28 Nov 2006; Tiziano Müller <dev-zero@gentoo.org>
+  -libconf-0.42.00.ebuild, -libconf-0.42.00-r1.ebuild,
+  -libconf-0.42.10.ebuild, libconf-0.42.10-r1.ebuild:
+  Dropped old versions. Cleaned up the ebuild.
 
   07 Jun 2006; Damien Krotkine <dams@gentoo.org> libconf-0.40.00.ebuild:
   added xml IUSE, bug #135972
diff --git a/dev-util/libconf/files/digest-libconf-0.40.00 b/dev-util/libconf/files/digest-libconf-0.40.00
index cb977820eaaa..95cae05d978d 100644
--- a/dev-util/libconf/files/digest-libconf-0.40.00
+++ b/dev-util/libconf/files/digest-libconf-0.40.00
@@ -1 +1,3 @@
 MD5 9c6d795bf3c2d8603c3ab0b3ca300dc2 perl-Libconf-0.40.00.tar.bz2 321119
+RMD160 7e6dd1c172e58fae3bfd0e287773040e8acab2ec perl-Libconf-0.40.00.tar.bz2 321119
+SHA256 9ae847b73d1aabb6d60ceaeda3a8cc14041b557bcfc91c8951c97659fa94eaf1 perl-Libconf-0.40.00.tar.bz2 321119
diff --git a/dev-util/libconf/files/digest-libconf-0.42.10-r1 b/dev-util/libconf/files/digest-libconf-0.42.10-r1
index 0fd9caee1f3f..197ddfaecf21 100644
--- a/dev-util/libconf/files/digest-libconf-0.42.10-r1
+++ b/dev-util/libconf/files/digest-libconf-0.42.10-r1
@@ -1 +1,3 @@
 MD5 2774e78071e7c224eeaf0570cde1c87c perl-Libconf-0.42.10.tar.bz2 203303
+RMD160 55e59e22fb8f2a0b4954abe52af03a58a1ed9847 perl-Libconf-0.42.10.tar.bz2 203303
+SHA256 91fc840042f0072c2de8520a044e5842df63c0f6f1c41ff989090c34c01ad40e perl-Libconf-0.42.10.tar.bz2 203303
diff --git a/dev-util/libconf/libconf-0.42.10-r1.ebuild b/dev-util/libconf/libconf-0.42.10-r1.ebuild
index 0e06cc8dbd1a..e43746940a8e 100644
--- a/dev-util/libconf/libconf-0.42.10-r1.ebuild
+++ b/dev-util/libconf/libconf-0.42.10-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/libconf-0.42.10-r1.ebuild,v 1.1 2006/03/02 00:21:57 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/libconf-0.42.10-r1.ebuild,v 1.2 2006/11/28 20:06:20 dev-zero Exp $
 
-inherit multilib
+inherit multilib toolchain-funcs
+
+MY_P=perl-Libconf-${PV}
 
-MY_P=perl-${PN/l/L}-${PV}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="Centralized abstraction layer for system configuration files"
 HOMEPAGE="http://libconf.net/"
 SRC_URI="http://libconf.net/download/${MY_P}.tar.bz2"
@@ -16,38 +16,40 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 IUSE="python ruby"
 DEPEND="dev-lang/perl
-dev-perl/DelimMatch
-dev-perl/XML-Twig
-python? ( >=dev-lang/python-2.4.2 )
-ruby? ( >=dev-lang/ruby-1.8.3 )"
-
-if use python ; then
-	mypython="python"
-fi
+	dev-perl/DelimMatch
+	dev-perl/XML-Twig
+	python? ( >=dev-lang/python-2.4.2 )
+	ruby? ( >=dev-lang/ruby-1.8.3 )"
 
-if use ruby ; then
-	myruby="ruby"
-fi
+S=${WORKDIR}/${MY_P}
 
-mybindings="c ${mypython} ${myruby} bash";
+bindings() {
+	local mybindings
+	mybindings="c bash"
+	use python && mybindings="${mybindings} python"
+	use ruby && mybindings="${mybindings} ruby"
+	echo ${mybindings}
+}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Multilib fix
-	sed -i "/^LIB_DIR/ { s:lib:$(get_libdir): }" \
-		bindings/c/src/Makefile \
-		|| die "bad sed"
+	sed -i \
+		-e "/^LIB_DIR/ { s:lib:$(get_libdir): }" \
+		-e 's/^CF=-Wall/CF=$(CFLAGS)/' \
+		bindings/c/src/Makefile || die "bad sed"
 }
 src_compile() {
-	emake "BINDINGS=${mybindings}" || die "make failed"
+	emake \
+		BINDINGS="$(bindings)" \
+		CC=$(tc-getCC) || die "make failed"
 }
 
 src_install() {
-	einstall "BINDINGS=${mybindings}" PREFIX=${D}/usr DESTDIR=${D} ROOT=${D}
-	dodoc AUTHORS COPYING ChangeLog \
-		bindings/ruby/src/AUTHORS \
-		bindings/ruby/src/README \
+	emake BINDINGS="$(bindings)" PREFIX="${D}/usr" DESTDIR="${D}" ROOT="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog \
+		bindings/ruby/src/{AUTHORS,README} \
 		bindings/python/src/README
 }