Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 27 insertions, 170 deletions

diff --git a/dev-libs/libelf/ChangeLog b/dev-libs/libelf/ChangeLog
index 43653bc45b4d..f58571c65ae7 100644
--- a/dev-libs/libelf/ChangeLog
+++ b/dev-libs/libelf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libelf
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.28 2009/11/21 09:24:32 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.29 2010/04/24 15:07:45 ssuominen Exp $
+
+*libelf-0.8.13 (24 Apr 2010)
+
+  24 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +libelf-0.8.13.ebuild:
+  Version bump.
 
 *libelf-0.8.12 (21 Nov 2009)
 
diff --git a/dev-libs/libelf/files/libelf-0.8.6-parallelmakefix.patch b/dev-libs/libelf/files/libelf-0.8.6-parallelmakefix.patch
deleted file mode 100644
index a9c4caaf892a..000000000000
--- a/dev-libs/libelf/files/libelf-0.8.6-parallelmakefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libelf-0.8.6/lib/Makefile.in.orig	2005-09-03 19:06:43.000000000 +1000
-+++ libelf-0.8.6/lib/Makefile.in	2005-09-03 19:07:52.000000000 +1000
-@@ -155,7 +155,7 @@
- 	$(AR) rcv $@ $(OBJS) $(LIBOBJS)
- 	$(RANLIB) $@
- 
--$(SHLIB): $(OBJS:.o=.os) $(LIBOBJS:.o=.os)
-+$(SHLIB): $(OBJS) $(LIBOBJS)
- 	@$(RM) $(SHLIB)
- 	$(LINK_SHLIB) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS)
- 	if test "$(SONAME)" = "$(SHLIB)"; then true; else \
diff --git a/dev-libs/libelf/files/libelf-0.8.9-parallelmakefix.patch b/dev-libs/libelf/files/libelf-0.8.9-parallelmakefix.patch
deleted file mode 100644
index 6a0eddfd0474..000000000000
--- a/dev-libs/libelf/files/libelf-0.8.9-parallelmakefix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- libelf-0.8.9/lib/Makefile.in.orig	2007-06-29 00:09:41.876160240 -0400
-+++ libelf-0.8.9/lib/Makefile.in	2007-06-29 00:10:13.601337280 -0400
-@@ -174,7 +174,7 @@ installdirs: $(top_srcdir)/mkinstalldirs
- 	    $(SHELL) $(top_srcdir)/mkinstalldirs $(instroot)$$dir; \
- 	done
- 
--install-data:
-+install-data: installdirs
- 	$(INSTALL_DATA) libelf.a $(instroot)$(libdir)
- 	-cd $(instroot)$(libdir) && $(RANLIB) libelf.a
- 	files="$(HDRS) $(AUXHDRS) elf_repl.h"; for file in $$files; do \
-@@ -194,7 +194,7 @@ uninstall-data:
- 
- install-shared-yes: install-shared
- install-shared-no:
--install-shared: $(SHLIB)
-+install-shared: installdirs $(SHLIB)
- 	$(INSTALL_SHLIB) $(SHLIB) $(instroot)$(libdir)
- 	if test "$(SONAME)" = "$(SHLIB)"; then true; else \
- 	  cd $(instroot)$(libdir) && $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \
-@@ -210,7 +210,7 @@ uninstall-shared:
- 
- install-compat-yes: install-compat
- install-compat-no:
--install-compat:
-+install-compat: installdirs
- 	files="$(HDRS)"; for file in $$files; do \
- 	  if test -f $(instroot)$(includedir)/$$file; then true; else \
- 	    echo "#include <libelf/$$file>" > $(instroot)$(includedir)/$$file; \
---- libelf-0.8.9/mkinstalldirs.orig	2007-06-29 15:22:54.048886832 -0400
-+++ libelf-0.8.9/mkinstalldirs	2007-06-29 15:31:49.261522144 -0400
-@@ -23,7 +23,13 @@ for file in ${1+"$@"} ; do 
- 
-      if test ! -d "${pathcomp}"; then
-         echo "mkdir $pathcomp" 1>&2
--        mkdir "${pathcomp}" || errstatus=$?
-+        mkdir "${pathcomp}"
-+        tmpstatus=$?
-+        if test "${tmpstatus}" != 0; then
-+           # If there was an error but the dir exists 
-+           # then a race happened so ignore the error
-+           test -d "${pathcomp}" || errstatus=${tmpstatus}
-+        fi
-      fi
- 
-      pathcomp="${pathcomp}/"
diff --git a/dev-libs/libelf/libelf-0.8.10.ebuild b/dev-libs/libelf/libelf-0.8.13.ebuild
index 6efc79e86f1a..8baf38e182de 100644
--- a/dev-libs/libelf/libelf-0.8.10.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.10.ebuild,v 1.3 2009/05/22 14:58:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13.ebuild,v 1.1 2010/04/24 15:07:45 ssuominen Exp $
 
-inherit multilib eutils
+EAPI=2
+inherit eutils multilib
 
 DESCRIPTION="A ELF object file access library"
 HOMEPAGE="http://www.mr511.de/software/"
@@ -13,39 +14,40 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug nls elibc_FreeBSD"
 
-DEPEND="!dev-libs/elfutils
+RDEPEND="!dev-libs/elfutils"
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
 
+src_prepare() {
 	if use elibc_FreeBSD; then
 		# Stop libelf from stamping on the system nlist.h
-		sed -i -e 's:nlist.h::g' lib/Makefile.in || die
+		sed -i \
+			-e 's:nlist.h::g' \
+			lib/Makefile.in || die
 
 		# Enable shared libs
 		sed -i \
 			-e 's:\*-linux\*\|\*-gnu\*:\*-linux\*\|\*-gnu\*\|\*-freebsd\*:' \
 			configure || die
 	fi
+
+	sed -i \
+		-e 's:$(LINK_SHLIB) -o:$(LINK_SHLIB) $(LDFLAGS) -o:' \
+		lib/Makefile.in || die
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable debug) \
 		--enable-shared \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable debug)
 }
 
 src_install() {
 	emake -j1 \
-		prefix="${D}"/usr \
-		libdir="${D}"usr/$(get_libdir) \
+		prefix="${D}usr" \
+		libdir="${D}usr/$(get_libdir)" \
 		install \
-		install-compat || die "emake install failed"
-	dodoc ChangeLog VERSION README
+		install-compat || die
+	dodoc ChangeLog README
 }
diff --git a/dev-libs/libelf/libelf-0.8.6.ebuild b/dev-libs/libelf/libelf-0.8.6.ebuild
deleted file mode 100644
index f949dd2cdd8c..000000000000
--- a/dev-libs/libelf/libelf-0.8.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.6.ebuild,v 1.1 2005/09/03 09:19:23 dragonheart Exp $
-
-inherit multilib eutils
-
-DESCRIPTION="A ELF object file access library"
-HOMEPAGE="http://www.mr511.de/software/"
-SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="nls"
-
-DEPEND="!dev-libs/elfutils
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-parallelmakefix.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		--enable-shared \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		libdir=${D}usr/$(get_libdir) \
-		includedir=${D}usr/include \
-		install \
-		install-compat || die
-	dodoc ChangeLog VERSION README
-}
diff --git a/dev-libs/libelf/libelf-0.8.9.ebuild b/dev-libs/libelf/libelf-0.8.9.ebuild
deleted file mode 100644
index e679d8faf1d4..000000000000
--- a/dev-libs/libelf/libelf-0.8.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.9.ebuild,v 1.3 2007/10/19 13:22:38 uberlord Exp $
-
-inherit multilib eutils
-
-DESCRIPTION="A ELF object file access library"
-HOMEPAGE="http://www.mr511.de/software/"
-SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="debug nls elibc_FreeBSD"
-
-DEPEND="!dev-libs/elfutils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}"-parallelmakefix.patch
-
-	if use elibc_FreeBSD; then
-		# Stop libelf from stamping on the system nlist.h
-		sed -i -e 's:nlist.h::g' lib/Makefile.in || die
-
-		# Enable shared libs
-		sed -i \
-			-e 's:\*-linux\*\|\*-gnu\*:\*-linux\*\|\*-gnu\*\|\*-freebsd\*:' \
-			configure || die
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		--enable-shared \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		libdir="${D}"usr/$(get_libdir) \
-		install \
-		install-compat || die "emake install failed"
-	dodoc ChangeLog VERSION README
-}