Remove old versions that fail to build; add a new snapsot and update the live ebuild to support Python properly and point to the right GIT repository.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

4 files changed, 32 insertions, 50 deletions

diff --git a/dev-util/dwarves/ChangeLog b/dev-util/dwarves/ChangeLog
index 491511257f98..9f6ab9d9907c 100644
--- a/dev-util/dwarves/ChangeLog
+++ b/dev-util/dwarves/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/dwarves
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/ChangeLog,v 1.19 2013/09/05 18:40:36 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/ChangeLog,v 1.20 2014/11/19 05:25:50 flameeyes Exp $
+
+*dwarves-1.10_p20140618 (19 Nov 2014)
+
+  19 Nov 2014; Diego E. Pettenò <flameeyes@gentoo.org>
+  +dwarves-1.10_p20140618.ebuild, -dwarves-1.10-r1.ebuild, -dwarves-1.9.ebuild,
+  dwarves-9999.ebuild:
+  Remove old versions that fail to build; add a new snapsot and update the live
+  ebuild to support Python properly and point to the right GIT repository.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> dwarves-1.10-r1.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/dev-util/dwarves/dwarves-1.10-r1.ebuild b/dev-util/dwarves/dwarves-1.10_p20140618.ebuild
index 63c0ca1ea67d..8463bc203b56 100644
--- a/dev-util/dwarves/dwarves-1.10-r1.ebuild
+++ b/dev-util/dwarves/dwarves-1.10_p20140618.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.10-r1.ebuild,v 1.2 2013/09/05 18:40:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.10_p20140618.ebuild,v 1.1 2014/11/19 05:25:50 flameeyes Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_COMPAT=( python2_7 )
 inherit multilib cmake-utils python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/acme/pahole.git;a=summary"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
@@ -24,11 +24,11 @@ if [[ ${PV//_p} == ${PV} ]]; then
 	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
 	S=${WORKDIR}
 else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.xz"
 fi
 
 DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${P}-python-import.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
 
 src_configure() {
 	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
diff --git a/dev-util/dwarves/dwarves-1.9.ebuild b/dev-util/dwarves/dwarves-1.9.ebuild
deleted file mode 100644
index 7b2aa857cf55..000000000000
--- a/dev-util/dwarves/dwarves-1.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.9.ebuild,v 1.1 2011/10/17 21:53:24 flameeyes Exp $
-
-EAPI=4
-
-inherit multilib cmake-utils
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/acme/pahole.git;a=summary"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/elfutils-0.131
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
-	S=${WORKDIR}
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
index 1c943911b918..74c589cb0417 100644
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ b/dev-util/dwarves/dwarves-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 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.8 2011/11/06 01:49:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-9999.ebuild,v 1.9 2014/11/19 05:25:50 flameeyes Exp $
 
-EAPI=4
+EAPI=5
 
-EGIT_REPO_URI="git://github.com/acmel/dwarves.git"
-#EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/acme/pahole.git"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git"
 
-inherit multilib cmake-utils git-2
+PYTHON_COMPAT=( python2_7 )
+inherit multilib cmake-utils git-2 python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/acme/pahole.git;a=summary"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
@@ -23,9 +23,18 @@ DEPEND="${RDEPEND}"
 
 DOC=( README README.ctracer )
 
+DOCS=( README README.ctracer NEWS )
+PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
+
 src_configure() {
 	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
 	cmake-utils_src_configure
 }
 
 src_test() { :; }
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${D}"/usr/bin/ostra-cg \
+		"${D}"/usr/share/dwarves/runtime/python/ostra.py
+}