7 files changed, 18 insertions, 67 deletions
diff --git a/dev-util/dwarves/ChangeLog b/dev-util/dwarves/ChangeLog
index 0dcdc7bcc43d..57f4e66d7872 100644
--- a/dev-util/dwarves/ChangeLog
+++ b/dev-util/dwarves/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/dwarves
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/ChangeLog,v 1.3 2007/12/30 18:26:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/ChangeLog,v 1.4 2007/12/30 19:01:03 flameeyes Exp $
+
+*dwarves-1.3 (30 Dec 2007)
+
+  30 Dec 2007; Diego Pettenò <flameeyes@gentoo.org> -dwarves-1.0.ebuild,
+  -dwarves-1.0_p1.ebuild, +dwarves-1.3.ebuild, dwarves-9999.ebuild:
+  Version bump, add forgotten flag-o-matic inherit, and depend for both 1.3
+  and 9999 on the latest version of elfutils as they need a function not
+  available on 0.127.
 
   30 Dec 2007; Diego Pettenò <flameeyes@gentoo.org> dwarves-1.0.ebuild,
   dwarves-9999.ebuild:
diff --git a/dev-util/dwarves/dwarves-1.0_p1.ebuild b/dev-util/dwarves/dwarves-1.0_p1.ebuild
deleted file mode 100644
index cb9754243858..000000000000
--- a/dev-util/dwarves/dwarves-1.0_p1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2007-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.0_p1.ebuild,v 1.1 2007/06/07 06:50:26 flameeyes Exp $
-
-inherit toolchain-funcs flag-o-matic multilib rpm
-
-MY_P="${P/_p/-}"
-
-DESCRIPTION="pahole and other dwarf debugging tools"
-HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/acme/pahole.git;a=summary"
-SRC_URI="http://oops.ghostprotocols.net:81/acme/dwarves/rpm/SRPMS/${MY_P}.src.rpm"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="dev-libs/elfutils"
-DEPEND=">=dev-util/cmake-2.4
-	${RDEPEND}"
-
-S="${WORKDIR}"
-BUILDDIR="${WORKDIR}/build"
-
-src_compile() {
-	mkdir "${BUILDDIR}"
-	cd "${BUILDDIR}"
-
-	tc-export CC CXX LD
-
-	use debug || append-flags -DNDEBUG
-
-	cmake \
-		-DCMAKE_C_FLAGS_RELEASE="" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-D__LIB=$(get_libdir) \
-		"${S}" \
-		|| die "cmake failed"
-
-	emake VERBOSE="1" || die "emake failed"
-}
-
-src_install() {
-	cd "${BUILDDIR}"
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	dodir /usr/share/pahole
-	mv "${D}/usr/$(get_libdir)/ctracer" \
-		"${D}/usr/share/pahole"
-
-	cd "${S}"
-	dodoc README README.ctracer
-}
diff --git a/dev-util/dwarves/dwarves-1.0.ebuild b/dev-util/dwarves/dwarves-1.3.ebuild
index 22e8c806a1b5..f9552c6fef56 100644
--- a/dev-util/dwarves/dwarves-1.0.ebuild
+++ b/dev-util/dwarves/dwarves-1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.0.ebuild,v 1.2 2007/12/30 18:26:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.3.ebuild,v 1.1 2007/12/30 19:01:03 flameeyes Exp $
 
-inherit toolchain-funcs multilib cmake-utils
+inherit toolchain-funcs multilib cmake-utils flag-o-matic
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/acme/pahole.git;a=summary"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug"
 
-RDEPEND="dev-libs/elfutils"
+RDEPEND=">=dev-libs/elfutils-0.131"
 
 S=${WORKDIR}
 
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
index 3611e6723e89..384476b8e05d 100644
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ b/dev-util/dwarves/dwarves-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-9999.ebuild,v 1.2 2007/12/30 18:26:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-9999.ebuild,v 1.3 2007/12/30 19:01:03 flameeyes Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/acme/pahole.git"
 
-inherit toolchain-funcs multilib cmake-utils git
+inherit toolchain-funcs multilib cmake-utils git flag-o-matic
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/acme/pahole.git;a=summary"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-RDEPEND="dev-libs/elfutils"
+RDEPEND=">=dev-libs/elfutils-0.131"
 
 src_compile() {
 	tc-export CC CXX LD
diff --git a/dev-util/dwarves/files/digest-dwarves-1.0 b/dev-util/dwarves/files/digest-dwarves-1.0
deleted file mode 100644
index a669b2232514..000000000000
--- a/dev-util/dwarves/files/digest-dwarves-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d23bbf3a7fd6f084883c1071dd921267 dwarves-1.0.tar.bz2 49781
-RMD160 32a656e9df56ac9382aa4903a2d0912bfff9229c dwarves-1.0.tar.bz2 49781
-SHA256 b34a5699101325ca2f30a72c8c804fd6402895c75f5dc3a90d9229a8de163e98 dwarves-1.0.tar.bz2 49781
diff --git a/dev-util/dwarves/files/digest-dwarves-1.0_p1 b/dev-util/dwarves/files/digest-dwarves-1.0_p1
deleted file mode 100644
index b74fad66b308..000000000000
--- a/dev-util/dwarves/files/digest-dwarves-1.0_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5a185bee30b2115a0105be7ce189f385 dwarves-1.0-1.src.rpm 58365
-RMD160 339a4a17d60c23cca0242df1d5bb2405e50aea48 dwarves-1.0-1.src.rpm 58365
-SHA256 9185fb1d3cad385d82dcb0aefbbb37152fb1972c255d2c7ea72945780bd87558 dwarves-1.0-1.src.rpm 58365
diff --git a/dev-util/dwarves/files/digest-dwarves-1.3 b/dev-util/dwarves/files/digest-dwarves-1.3
new file mode 100644
index 000000000000..deb64fba2e2d
--- /dev/null
+++ b/dev-util/dwarves/files/digest-dwarves-1.3
@@ -0,0 +1,3 @@
+MD5 680c696e0ce23026db88ecf1c13d74cf dwarves-1.3.tar.bz2 55502
+RMD160 2b2236234df469e241c2d64c982b54446da5bb35 dwarves-1.3.tar.bz2 55502
+SHA256 cd8ba7bbd3c4de8381d03bbce27982db714f4b1f4fef9ac6ce1881c22949757e dwarves-1.3.tar.bz2 55502