added good fix thanks to Gregorio Guidi <g.guidi@sns.it> in bug #46805

4 files changed, 32 insertions, 13 deletions

diff --git a/app-crypt/qca-tls/ChangeLog b/app-crypt/qca-tls/ChangeLog
index df3e282f3933..a00139b909d1 100644
--- a/app-crypt/qca-tls/ChangeLog
+++ b/app-crypt/qca-tls/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-crypt/qca-tls
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/ChangeLog,v 1.14 2004/11/16 09:27:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/ChangeLog,v 1.15 2004/11/16 09:44:59 dragonheart Exp $
 
-  16 Nov 2004; Daniel Black <dragonheart@gentoo.org> qca-tls-1.0.ebuild:
-  Put it big dodgy workaround for broken qmake solving bug #46805. Thanks to
-  Eduardo <eduardo@edubox.org> and others for the bug report.
+  16 Nov 2004; Daniel Black <dragonheart@gentoo.org> +files/qca-pathfix.patch,
+  qca-tls-1.0.ebuild:
+  added good fix thanks to Gregorio Guidi <g.guidi@sns.it> in bug #46805
 
   16 Aug 2004; Tom Gall <tgall@gentoo.org> qca-tls-1.0.ebuild:
   stable on ppc64, bug #58226
diff --git a/app-crypt/qca-tls/Manifest b/app-crypt/qca-tls/Manifest
index 615759bf7f27..86985ccc565a 100644
--- a/app-crypt/qca-tls/Manifest
+++ b/app-crypt/qca-tls/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fd286e368c744a18b08dd9a9e8084bab ChangeLog 1579
-MD5 8a91a401bdb99f5575f32a298bdff010 qca-tls-1.0.ebuild 903
+MD5 9a48049c9ba24ab40f9727dd29434c48 ChangeLog 1541
+MD5 daac9e99f24629d46c091cb21c8805b3 qca-tls-1.0.ebuild 972
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 5398cdc5d090333de8881b20f3d10f8e files/digest-qca-tls-1.0 63
+MD5 f87721e55c7f47d133faa99241219ae5 files/qca-pathfix.patch 301
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBmcgMmdTrptrqvGERAt0MAJ9sedk/dQGzzsf4WTp7SHomEYTRKgCeN4BM
-f+80ryeqNk5DQE+igzLIu0s=
-=XrT4
+iD8DBQFBmcwhmdTrptrqvGERAksmAJ9vtRkDj43ZpblqKIRh/zgWwzgY7gCZARxA
+nxqhcl3rXIbRDvhLBDDtd3E=
+=vmFd
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/qca-tls/files/qca-pathfix.patch b/app-crypt/qca-tls/files/qca-pathfix.patch
new file mode 100644
index 000000000000..ae7f0ba73d2b
--- /dev/null
+++ b/app-crypt/qca-tls/files/qca-pathfix.patch
@@ -0,0 +1,11 @@
+--- qca-tls.pro.orig	2004-11-16 19:10:48.593870776 +0930
++++ qca-tls.pro	2004-11-16 19:11:07.749958608 +0930
+@@ -1,7 +1,7 @@
+ # qca-tls qmake profile
+ 
+ TEMPLATE = lib
+-CONFIG  += qt thread release plugin
++CONFIG  += qt thread release plugin no_fixpath
+ TARGET   = qca-tls
+ 
+ !exists(qcaprovider.h) {
diff --git a/app-crypt/qca-tls/qca-tls-1.0.ebuild b/app-crypt/qca-tls/qca-tls-1.0.ebuild
index fc80f5e90aef..a73dbe5aad09 100644
--- a/app-crypt/qca-tls/qca-tls-1.0.ebuild
+++ b/app-crypt/qca-tls/qca-tls-1.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0.ebuild,v 1.16 2004/11/16 09:27:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0.ebuild,v 1.17 2004/11/16 09:44:59 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="plugin to provide SSL/TLS capability to programs that utilize the Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="http://psi.affinix.com/"
@@ -14,17 +16,22 @@ IUSE=""
 DEPEND=">=x11-libs/qt-3.3.0-r1
 	>=dev-libs/openssl-0.9.6i"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/qca-pathfix.patch || die "bad patch"
+}
+
 src_compile() {
 	./configure || die "configure failed"
 	sed -i \
-		-e "/^CFLAGS/s:$:${CFLAGS}:" \
-		-e "/^CXXFLAGS/s:$:${CXXFLAGS}:" \
+		-e "/^CFLAGS/s:$: ${CFLAGS}:" \
+		-e "/^CXXFLAGS/s:$: ${CXXFLAGS}:" \
 		Makefile
 	emake || die "emake failed"
 }
 
 src_install() {
-	sed -i -e "s:../../../../..:/usr:g" Makefile
 	make INSTALL_ROOT="${D}" install || die "make install failed"
 	dodoc README
 }