0001-bgo-386873.patch

0001-bgo-386873.patch (text/plain), 4.76 KB, created by Justin Lecher (RETIRED) on 2011-10-12 07:53:05 UTC

From 03a68573280f39273e182aa4f1a0b160207d6195 Mon Sep 17 00:00:00 2001
From: Justin Lecher <[e-mail]>
Date: Wed, 12 Oct 2011 09:50:46 +0200
Subject: [PATCH] bgo 386873

---
 app-portage/autodep/Manifest                      |    6 ++--
 app-portage/autodep/autodep-0.2.ebuild            |   30 +++++++++++++++++---
 app-portage/autodep/files/autodep-0.2-build.patch |   20 ++++++++++++++
 app-portage/autodep/metadata.xml                  |    1 -
 4 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 app-portage/autodep/files/autodep-0.2-build.patch

diff --git a/app-portage/autodep/Manifest b/app-portage/autodep/Manifest
index 54d719d..3c248cf 100644
--- a/app-portage/autodep/Manifest
+++ b/app-portage/autodep/Manifest
@@ -1,5 +1,5 @@
 DIST autodep-0.1.tar.bz2 960704 RMD160 3934ee314270e35dba78d09567ee889256d70999 SHA1 982221bae181f3bfedb974f13dafa35684276fa0 SHA256 281de88d57649e00d202cb45e36cd47b54908c76ef371a7b6585d2a33717a31a
 DIST autodep-0.2.tar.bz2 966275 RMD160 a95fab6b3f769f51d297e0f480a93cc06bd6bbbf SHA1 0cdf7bc76bc2166b8588a92150cf0f592c7e48c6 SHA256 8768ba2918ca9b51a919622d43525dbeb8a3d0873acd7bde234eb06dd222fe78
-EBUILD autodep-0.1.ebuild 603 RMD160 96f606f31a227020244e7f2296a39cc1a3141c73 SHA1 3d6e334a3d780faa903d3fc28158e31a6c558bd5 SHA256 dd0d6d415a2cb26648752a95a4a2c651d0d88f6257c01eeaabf8ecb30341b893
-EBUILD autodep-0.2.ebuild 570 RMD160 42ad0a65a773ccccb91c72baf8102ca25502a305 SHA1 81b091dc50350fee70008c7bef4e32b9b490ef19 SHA256 d5d95b3292db252a7d2d021d1f8ccec0a0458cb41e83e5deedbd78c605d7d0cd
-MISC metadata.xml 258 RMD160 fe64d0bceda27568f9a9663eb1637748f20a9833 SHA1 1279c416a1501dfcba7640f62164039679d0f100 SHA256 dd02c48a5ce93ff2c5456b4502a7f59e2352da3b44754fe2798d53244b1abd22
+EBUILD autodep-0.1.ebuild 984 RMD160 283464d52272b3522289f885817b83558d6f2688 SHA1 375486f6c89bf46365b1a6111dc896b3b4c5cad5 SHA256 2a81c5eb4cb94d7457815d65d0fd161fa6311cda21d51206ec732eb8619744dd
+EBUILD autodep-0.2.ebuild 989 RMD160 77aff9e6fcb939f35c3b18384681b395a4775309 SHA1 da5743393711e0a319bb661435db92f7fcdbe22f SHA256 3818076dc4c6a21ca21ec0e73df7cc6131542f918246f2c855be2133fbe5dae5
+MISC metadata.xml 236 RMD160 c6016193e6e7f695842ec19ec763036f58bdda4e SHA1 fa16ff69bc55dbe8a1d1b0b35ba003f1721bb827 SHA256 611f4a8c32b3d1653e7e925d9fc3731bca94046e373abacf3e44180cbb707f6c
diff --git a/app-portage/autodep/autodep-0.2.ebuild b/app-portage/autodep/autodep-0.2.ebuild
index b7d5189..e4f494b 100644
--- a/app-portage/autodep/autodep-0.2.ebuild
+++ b/app-portage/autodep/autodep-0.2.ebuild
@@ -7,7 +7,7 @@ EAPI=3
 PYTHON_DEPEND="2:2.6"
 RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
 
-inherit python
+inherit autotools eutils flag-o-matic multilib python
 
 DESCRIPTION="Auto dependency analyser for Gentoo"
 HOMEPAGE="http://soc.dev.gentoo.org/~bay/autodep/"
@@ -18,11 +18,31 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND="sys-fs/fuse
+RDEPEND="
+	app-portage/portage-utils
+	sys-fs/fuse"
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
-RDEPEND="sys-fs/fuse
-	app-portage/portage-utils"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed "s:usr/lib:/usr/$(get_libdir):g" -i Makefile || die
+	tc-export CC
+	export raw_LDFLAGS="$(raw-ldflags)"
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+    emake DESTDIR="${D}" install || die
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/portage_with_autodep
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/portage_with_autodep
 }
diff --git a/app-portage/autodep/files/autodep-0.2-build.patch b/app-portage/autodep/files/autodep-0.2-build.patch
new file mode 100644
index 0000000..f0cd849
--- /dev/null
+++ b/app-portage/autodep/files/autodep-0.2-build.patch
@@ -0,0 +1,20 @@
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 01c92f1..bd016d0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,10 +5,10 @@ hookfs: src/hook_fusefs/hookfs.c
+ 	$(CFLAGS) $(LDFLAGS) src/hook_fusefs/hookfs.c -o hookfs
+ 
+ file_hook.so: file_hook.o
+-	ld -shared -o file_hook.so -ldl -lc file_hook.o
++	ld $(raw_LDFLAGS) -shared -o file_hook.so -ldl -lc file_hook.o
+ 
+ file_hook.o: src/hook_lib/file_hook.c
+-	cc -Wall -fPIC -o file_hook.o -c src/hook_lib/file_hook.c
++	$(CC) -Wall -fPIC -o file_hook.o -c src/hook_lib/file_hook.c
+ 
+ install:
+ 	mkdir -p "${DESTDIR}/usr/lib/"
diff --git a/app-portage/autodep/metadata.xml b/app-portage/autodep/metadata.xml
index a79551c..4f89f47 100644
--- a/app-portage/autodep/metadata.xml
+++ b/app-portage/autodep/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>[e-mail]</email>
 		<name>Alexander Bersenev</name>
-- 
1.7.7