fix bug 423817

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 46 insertions, 15 deletions

diff --git a/dev-util/dwarves/ChangeLog b/dev-util/dwarves/ChangeLog
index fc657f52e413..4be66ebb7bb7 100644
--- a/dev-util/dwarves/ChangeLog
+++ b/dev-util/dwarves/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2013/03/03 10:27:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/ChangeLog,v 1.18 2013/03/03 15:12:43 hasufell Exp $
+
+*dwarves-1.10-r1 (03 Mar 2013)
+
+  03 Mar 2013; Julian Ospald <hasufell@gentoo.org> -dwarves-1.10.ebuild,
+  +dwarves-1.10-r1.ebuild, +files/dwarves-1.10-python-import.patch:
+  fix bug 423817
 
   03 Mar 2013; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Drop to maintainer needed.
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 81f67326eb88..297cb4347fc0 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX dwarves-1.10-python-import.patch 399 SHA256 d18a0e7d7d64679c045a1209e86aa338b6e51a45bd490c76dddda2f5815b770d SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314 WHIRLPOOL f75d4edc76c6122a80b88f8ff4c0071df4019551ed9f75cd46b18480ae239728c4b8fe6b9e736dc3a2627cd17743e9c96893ddeac6cd575f57f2494d8fa7dc8e
 DIST dwarves-1.10.tar.bz2 96919 SHA256 557306e1b58b475f689f44095ec62388877b1a8dd06174f97e309994c15bcc14 SHA512 2066b4864bd3e0382ee76df5b38b5f1069a03d6117118e5321da1b996030fe0478ebd4f67773aef9f0c6f5e8e6ba6435550a65437f5bfdfb1ead741389a677d8 WHIRLPOOL a15388dc4e59c2a776fa5eb83afafc720adba18232fb9dc39e6a860dd9127256ab9b1da077fa1a053229a04699a6bc084f565dbad4872f9509f4244d29ae4b76
 DIST dwarves-1.9.tar.bz2 96125 SHA256 1161337928e06a1c2b5caf418aca2ba38f03fca586e1a469e722bc23b95e6935 SHA512 385c7e8f7aac1aff23d342fb8c5f4b6b7be664cf95d347de90138675121f89d3e7520f188e2b29a829e7cb0b66577139a27a7d9fd50ed4bec4f253ce249927e4 WHIRLPOOL 126be836f24eac9793b367ed22bf51a348e46a99afe4b9168ce975421ba56898b44a5375249e7253e0bbb5054ce690eaf28f16c5062950e50144c31f32ac302e
-EBUILD dwarves-1.10.ebuild 847 SHA256 780454ffe203ed472632aec8d51b671922be356058c1ae448470562ac63a0872 SHA512 4da68a3060b4602b467572f6d8f2263f175b5ac581848382cdeea9594f57dbc75f1c9ea087969d351dfc724147e85fecbe372e9465bd4f19a21331a3fee5e087 WHIRLPOOL 47ffca38e27e7ceaf109395bb8da2c0ce492a26e97f1bc1f34bdf471aa0899388614c6547915fdebfdac1c3b12a9bc083def1a0df29c477b46c2c8ea88e0c1e9
+EBUILD dwarves-1.10-r1.ebuild 1122 SHA256 e9589f2dd0bbe980074cc5f130ce766e9b40577c3f117ade174a13e8679b0e4b SHA512 95fb3182a88e97664bf59a58dc2366e5362127167fd7cee7492d75a878f55766e71dad016ff2800623efde6ff7c96b752af6241baffe58159e6fb3fe76253706 WHIRLPOOL 1bc067ca139c96cfdc351c3be3e1c634aa0de8328c1898f27fa5faf00d76955668181f96af7614d112463e80231a13cc020c79f4807f3f618a01da2db80da2ff
 EBUILD dwarves-1.9.ebuild 846 SHA256 9510167c024108c6b730189ed355ec93e94b5309244d652b9a29c14c57bfa868 SHA512 890f8e05af224fd222e205c26c5fda89902b60a6651d5ba7e71418aaacfb30df0e3c2f7779c31bc6f462a3fbea14321cdc39dd87d86a88fbcd9e71ab3ad7914e WHIRLPOOL fb0546978f744a88910e8cb6db01e53e53a7aa70d2d151c6370f75f670a55e1ada91a1bd17b08050032b8e50cd55545969e85db5805a08e5dcb528657ed526d4
 EBUILD dwarves-9999.ebuild 813 SHA256 7eb731f37cbbbc66ba61e2cd07081b5e937a94c121eb0aed2b5f0334df9298ef SHA512 cc91a3ceee05a9349f2186d7729de0f3d00d508900892e4309f8a285fd4042c30a77d73c6111fd3c2a2e4c155966405879a7fccf342bf370a6edbdc7645b0a96 WHIRLPOOL ca4dc9213b9529e3c8c45fce29481da629649268c67c8968d91d015484522ddfbb5172ff4f87ab99b5f316416c76985463b543b7ad41c5949b0132906255b549
-MISC ChangeLog 3174 SHA256 d2469a6fff6c3caca43ddd0b452916ddedf53e519e8d481647e0733e86038785 SHA512 87f55a408afc5b9f3b6078e3f00facdb624c996af3ed1b6cca905da212477fcbe9e0e9f9a73291fbffa7cb93d13a9821e8486d1066417779aab92d5e0977ff12 WHIRLPOOL cac88ce3fe0b3b9ae496d72579d723d342a07a6390da929b38eaadf682b5fe94cdc0c5236948b5fb81bb05fad726e88e95197e246449f821a88e2f3d6e5bbf90
+MISC ChangeLog 3364 SHA256 d55125947f08c919465cd478cd76a573dcf579fb1deb4bc06c169929fd430869 SHA512 c0fdfb23c6e94af6386b6d7025455a56b3f6347c0073f2d2a43cd96488c32864f9cca53a43a1634595a05d7a6952e588122c695a9a61ab43e7b29f2ab1a65cbd WHIRLPOOL 28083168ca72985945e93888d39073de4ed0f186b2a33d4752b2d9ebf1dfbeee94b2767118dde951fa39ccf1f508796e0651a2983786ebc51a593e44bed30fd5
 MISC metadata.xml 633 SHA256 518a7ba935fd1c2839602e0b21d7f796213038a7aa4229152bfb32457a12f852 SHA512 6dca626becf9ab83d329ddbdcf90398ba88dfe8ab2714f96d573fa892674ab06661f7635d98497eb3cb4ae4610ec9b81971c43d4d291a1fb1c5eb908cf549e04 WHIRLPOOL c1c62e52891c18ccc16388cda1ba3a470d5d855f3353a079d4bee2c5db74aabe920f613543fcf5bec4d5ebfe717c7597770e676335831e4b854cecb8cbd64a48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRMyWJAAoJEBzRPIrUMBNCvWsH/AngFxMwE8S35iw3+GTGf9Vd
-WA6n4MbEwOdNbhkNel9I4s3ADpV0RVlTc965kQMcYI0KsxPDeNK0lzWhzg++whkQ
-hP264SP9Z8kgEuOMEYIEnRsAiZI83x8FzQW5OJZ3vi7+bTit7YXvr811r2+iYFiT
-C5y9g+eKBBLvYjvSk/iOOcvwrjP5XPc+IxbV6kI7RExKr5VbKjzo6CN4eefhBhXN
-H+NI0HXbVNa3L0ktdYOlRKz1vrPiAxKHAk4smp6lToFhW9nJ94kTIYH0jsLHsO9F
-KwYpYyqxU4AqKugSnOvYNYv1+A8bvEYFRPe3eXPH+Y2xD4ktLYcVtbCq0IQqDEY=
-=XEmU
+iQEcBAEBCAAGBQJRM2htAAoJEFpvPKfnPDWzBFwIAIgwotyDTHDPVL8pOr1lVGxT
+R/93dVwVKIn+D6Eq4AleKSeZzz1a6WFnI4MbmJ0GMcZ+bzW4T4j9nIy9M9UMqIn5
+HVW1HZF17Gf43s33WjpManDc0nrHaZkBPULUUzAtvJqoxRITO7ISIPSPbw/9MWbY
+/ZBfHaGQXpTbdtnBj/gr2Bi+G5RzpsYWBOdo/ZJAFfFNULJOpyhgTOLhZCHQ73Ou
+nS3SoY307cV5vy/qoeUFRJfKYGbtb88qPrkIp4wQTom71pJRmOYmRAc5pTbmwRW6
+wE12pTBmYxs/1cIlZ1uHeseGI53V25CbeoghOJWuT3akqdpfgAUQiOUh/O/QrF4=
+=w/js
 -----END PGP SIGNATURE-----
diff --git a/dev-util/dwarves/dwarves-1.10.ebuild b/dev-util/dwarves/dwarves-1.10-r1.ebuild
index a68cc548bd56..c640afaa23f1 100644
--- a/dev-util/dwarves/dwarves-1.10.ebuild
+++ b/dev-util/dwarves/dwarves-1.10-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.10.ebuild,v 1.1 2012/08/02 15:11:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.10-r1.ebuild,v 1.1 2013/03/03 15:12:43 hasufell Exp $
 
-EAPI=4
+EAPI=5
 
-inherit multilib cmake-utils
+PYTHON_COMPAT=( python2_5 python2_6 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"
@@ -14,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug"
 
-RDEPEND=">=dev-libs/elfutils-0.131
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.131
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
@@ -26,6 +28,7 @@ else
 fi
 
 DOCS=( README README.ctracer NEWS )
+PATCHES=( "${FILESDIR}"/${P}-python-import.patch )
 
 src_configure() {
 	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
@@ -33,3 +36,9 @@ 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
+}
diff --git a/dev-util/dwarves/files/dwarves-1.10-python-import.patch b/dev-util/dwarves/files/dwarves-1.10-python-import.patch
new file mode 100644
index 000000000000..e308ac6e2788
--- /dev/null
+++ b/dev-util/dwarves/files/dwarves-1.10-python-import.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=423817
+
+--- dwarves-1.10/ostra/ostra-cg
++++ dwarves-1.10/ostra/ostra-cg
+@@ -10,7 +10,9 @@
+ # under the terms of version 2 of the GNU General Public License as
+ # published by the Free Software Foundation.
+ 
+-import sys, datetime, os, ostra
++import sys
++sys.path.insert(0, "/usr/share/dwarves/runtime/python")
++import datetime, os, ostra
+ 
+ class_def = None
+