ebuild fixes. Thanks to Justin Lecher for it

7 files changed, 98 insertions, 15 deletions

diff --git a/autodep_overlay/app-portage/autodep/Manifest b/autodep_overlay/app-portage/autodep/Manifest
index 951e2c1..d5663d6 100644
--- a/autodep_overlay/app-portage/autodep/Manifest
+++ b/autodep_overlay/app-portage/autodep/Manifest
@@ -1,7 +1,9 @@
+AUX autodep-0.2-build.patch 628 RMD160 e21dc8071b9c3832c2d5da1f34af2364529a8442 SHA1 1e2d778f247d71d9db0b393385cdad3a1269ffef SHA256 694c2c773b042ac367cef511372535ea3b1aad0e3ee0192800db3bd08fd4873b
+AUX autodep-0.3-build.patch 628 RMD160 e21dc8071b9c3832c2d5da1f34af2364529a8442 SHA1 1e2d778f247d71d9db0b393385cdad3a1269ffef SHA256 694c2c773b042ac367cef511372535ea3b1aad0e3ee0192800db3bd08fd4873b
 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
 DIST autodep-0.3.tar.bz2 966193 RMD160 2c8935a77cd7453e19a6f4d6bf45f4dca9c648b3 SHA1 898252ceca7f342a0219419bedca4cdebefa61b9 SHA256 2a2d371757aebdff394b3e7ff5dd0ba6843aad04e2d0ed33cca38d4e929640bd
-EBUILD autodep-0.1.ebuild 609 RMD160 7eaad24ea04324d295ae137de0f6b02ae91051bc SHA1 67fce464277d0a578da8842326de4d0eff4638be SHA256 3b9d0d74e46beaf91c5aab497157ec1c25736309b2be2d7732b80e97e79d9158
-EBUILD autodep-0.2.ebuild 609 RMD160 7eaad24ea04324d295ae137de0f6b02ae91051bc SHA1 67fce464277d0a578da8842326de4d0eff4638be SHA256 3b9d0d74e46beaf91c5aab497157ec1c25736309b2be2d7732b80e97e79d9158
-EBUILD autodep-0.3.ebuild 609 RMD160 7eaad24ea04324d295ae137de0f6b02ae91051bc SHA1 67fce464277d0a578da8842326de4d0eff4638be SHA256 3b9d0d74e46beaf91c5aab497157ec1c25736309b2be2d7732b80e97e79d9158
-MISC metadata.xml 258 RMD160 fe64d0bceda27568f9a9663eb1637748f20a9833 SHA1 1279c416a1501dfcba7640f62164039679d0f100 SHA256 dd02c48a5ce93ff2c5456b4502a7f59e2352da3b44754fe2798d53244b1abd22
+EBUILD autodep-0.1.ebuild 603 RMD160 96f606f31a227020244e7f2296a39cc1a3141c73 SHA1 3d6e334a3d780faa903d3fc28158e31a6c558bd5 SHA256 dd0d6d415a2cb26648752a95a4a2c651d0d88f6257c01eeaabf8ecb30341b893
+EBUILD autodep-0.2.ebuild 1021 RMD160 911343780edf90f988f7190097913cc16edbe80f SHA1 c8a6bafcdb62c991158092d21853fa5c5808bfea SHA256 75234d3696131dd0b702e4854c286df3a3494d66fc741f10e8938bd34b2373a1
+EBUILD autodep-0.3.ebuild 1021 RMD160 911343780edf90f988f7190097913cc16edbe80f SHA1 c8a6bafcdb62c991158092d21853fa5c5808bfea SHA256 75234d3696131dd0b702e4854c286df3a3494d66fc741f10e8938bd34b2373a1
+MISC metadata.xml 236 RMD160 c6016193e6e7f695842ec19ec763036f58bdda4e SHA1 fa16ff69bc55dbe8a1d1b0b35ba003f1721bb827 SHA256 611f4a8c32b3d1653e7e925d9fc3731bca94046e373abacf3e44180cbb707f6c
diff --git a/autodep_overlay/app-portage/autodep/autodep-0.1.ebuild b/autodep_overlay/app-portage/autodep/autodep-0.1.ebuild
index 62b4290..ef5a9bf 100644
--- a/autodep_overlay/app-portage/autodep/autodep-0.1.ebuild
+++ b/autodep_overlay/app-portage/autodep/autodep-0.1.ebuild
@@ -24,9 +24,9 @@ RDEPEND="sys-fs/fuse
 	app-portage/portage-utils"
 
 src_compile() {
-    emake || die
+	emake || die
 }
 
 src_install() {
-    emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 }
diff --git a/autodep_overlay/app-portage/autodep/autodep-0.2.ebuild b/autodep_overlay/app-portage/autodep/autodep-0.2.ebuild
index 62b4290..c521963 100644
--- a/autodep_overlay/app-portage/autodep/autodep-0.2.ebuild
+++ b/autodep_overlay/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,10 +18,22 @@ 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_compile() {
     emake || die
@@ -30,3 +42,12 @@ src_compile() {
 src_install() {
     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/autodep_overlay/app-portage/autodep/autodep-0.3.ebuild b/autodep_overlay/app-portage/autodep/autodep-0.3.ebuild
index 62b4290..c521963 100644
--- a/autodep_overlay/app-portage/autodep/autodep-0.3.ebuild
+++ b/autodep_overlay/app-portage/autodep/autodep-0.3.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,10 +18,22 @@ 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_compile() {
     emake || die
@@ -30,3 +42,12 @@ src_compile() {
 src_install() {
     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/autodep_overlay/app-portage/autodep/files/autodep-0.2-build.patch b/autodep_overlay/app-portage/autodep/files/autodep-0.2-build.patch
new file mode 100644
index 0000000..c6358f4
--- /dev/null
+++ b/autodep_overlay/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 -ldl $(raw_LDFLAGS) -shared -o file_hook.so -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/autodep_overlay/app-portage/autodep/files/autodep-0.3-build.patch b/autodep_overlay/app-portage/autodep/files/autodep-0.3-build.patch
new file mode 100644
index 0000000..c6358f4
--- /dev/null
+++ b/autodep_overlay/app-portage/autodep/files/autodep-0.3-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 -ldl $(raw_LDFLAGS) -shared -o file_hook.so -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/autodep_overlay/app-portage/autodep/metadata.xml b/autodep_overlay/app-portage/autodep/metadata.xml
index a79551c..4f89f47 100644
--- a/autodep_overlay/app-portage/autodep/metadata.xml
+++ b/autodep_overlay/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>bay@hackerdom.ru</email>
 		<name>Alexander Bersenev</name>