adding missing emake in src_compile to make sure it doesn't compile in src_install, fixing bug 104685

Package-Manager: portage-2.0.51.22-r2

5 files changed, 32 insertions, 9 deletions

diff --git a/dev-perl/PerlQt/ChangeLog b/dev-perl/PerlQt/ChangeLog
index e590202f6bad..87b4e6938869 100644
--- a/dev-perl/PerlQt/ChangeLog
+++ b/dev-perl/PerlQt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/PerlQt
 # Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/ChangeLog,v 1.17 2005/08/07 13:05:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/ChangeLog,v 1.18 2005/09/07 20:15:55 blubb Exp $
+
+  07 Sep 2005; Simon Stelling <blubb@gentoo.org>
+  +files/PerlQt-3.008-fPIC.patch, PerlQt-3.008-r1.ebuild,
+  PerlQt-3.009_beta1.ebuild:
+  adding missing emake in src_compile to make sure it doesn't compile in
+  src_install, fixing bug 104685
 
   07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   PerlQt-3.008-r1.ebuild:
diff --git a/dev-perl/PerlQt/Manifest b/dev-perl/PerlQt/Manifest
index b2dd2118c5a2..6aa43ba365ef 100644
--- a/dev-perl/PerlQt/Manifest
+++ b/dev-perl/PerlQt/Manifest
@@ -1,10 +1,11 @@
-MD5 a11eb6cb91cd55e190c87cec7c628e7c PerlQt-3.009_beta1.ebuild 1663
-MD5 383e2322017a0c362c3aac61e93b547d PerlQt-3.008-r1.ebuild 1568
-MD5 1cb6da3bebab4edbf728de5472795074 metadata.xml 418
-MD5 7a7d3998fa299b4ba7da8744886f8dbc ChangeLog 2487
+MD5 179f60a79075af1cecab7dc35c51e3ce ChangeLog 2729
 MD5 5765fd9f59544067de23c828314bda75 PerlQt-3.006.ebuild 1491
+MD5 f703345571ae474d745bfc087e960507 PerlQt-3.008-r1.ebuild 1619
 MD5 7f70ec59e3c054064a989932d997842f PerlQt-3.008.ebuild 1448
+MD5 1cb6da3bebab4edbf728de5472795074 metadata.xml 418
+MD5 2f5d8443cb8bc5b09dc332952c797794 PerlQt-3.009_beta1.ebuild 1671
 MD5 6e31b51624ef86d8c454e250b6c8c623 files/digest-PerlQt-3.006 64
-MD5 82816eee040a4748cc35d7cce3b57604 files/digest-PerlQt-3.009_beta1 68
 MD5 ceef6c70a11f2b773cebdfdd3f9fe21a files/digest-PerlQt-3.008 64
 MD5 ceef6c70a11f2b773cebdfdd3f9fe21a files/digest-PerlQt-3.008-r1 64
+MD5 82816eee040a4748cc35d7cce3b57604 files/digest-PerlQt-3.009_beta1 68
+MD5 577d3c5977cd3e11bfdfc3b0c11920a2 files/PerlQt-3.008-fPIC.patch 314
diff --git a/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild b/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild
index 04adad047711..aea33ddce22c 100644
--- a/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild
+++ b/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild,v 1.8 2005/08/07 13:05:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild,v 1.9 2005/09/07 20:15:55 blubb Exp $
 
-inherit perl-module kde
+inherit perl-module kde eutils
 
 #install pqtsh to this directory
 myinst="${myinst} INSTBINDIR=${D}/usr/bin"
@@ -29,11 +29,14 @@ src_unpack() {
 	cp Makefile.PL.in Makefile.PL.in.orig
 	perl -pi -e "s#WriteMakefile\(#WriteMakefile\(\n'PREFIX' => '${D}/usr',#" Makefile.PL.in
 	cd ${S}
+	epatch ${FILESDIR}/${P}-fPIC.patch
 }
 
 src_compile() {
 	addwrite $QTDIR/etc/settings
 	perl-module_src_prep
+	
+	emake
 }
 
 src_install() {
diff --git a/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild b/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild
index 433d162a25bc..8031df0c90b8 100644
--- a/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild
+++ b/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild,v 1.1 2005/07/07 13:28:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild,v 1.2 2005/09/07 20:15:55 blubb Exp $
 
 inherit perl-module kde
 
@@ -36,6 +36,8 @@ src_compile() {
 	useq arts || myconf="${myconf} --without-arts"
 	addwrite $QTDIR/etc/settings
 	perl-module_src_prep
+
+	emake
 }
 
 src_install() {
diff --git a/dev-perl/PerlQt/files/PerlQt-3.008-fPIC.patch b/dev-perl/PerlQt/files/PerlQt-3.008-fPIC.patch
new file mode 100644
index 000000000000..35d749c320cf
--- /dev/null
+++ b/dev-perl/PerlQt/files/PerlQt-3.008-fPIC.patch
@@ -0,0 +1,11 @@
+--- smoke/qt/Makefile.in.old	2005-09-07 21:41:03.000000000 +0200
++++ smoke/qt/Makefile.in	2005-09-07 21:41:23.000000000 +0200
+@@ -55,7 +55,7 @@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ -fPIC
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@