Version bump, use external GeoIP version now without patch; add instead a patch for GCC 4.1 compatibility.

Package-Manager: portage-2.1.2_pre3-r3

5 files changed, 78 insertions, 8 deletions

diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index d519528c62b9..3c99814ce538 100644
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/tork
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.7 2006/09/30 12:04:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.8 2006/10/19 01:15:51 flameeyes Exp $
+
+*tork-0.09 (19 Oct 2006)
+
+  19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tork-0.09-gcc41.patch, +tork-0.09.ebuild:
+  Version bump, use external GeoIP version now without patch; add instead a
+  patch for GCC 4.1 compatibility.
 
   30 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/tork-0.07-geoip.patch, -files/tork-0.07-qt335.patch,
diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index ee4476c0676b..c2f85aef76bb 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -9,15 +9,24 @@ AUX tork-0.08-geoip.patch 3233 RMD160 963a714068ca409486d40f6dc2c3555bdad966d5 S
 MD5 042a0102d401251148dd9928e93a7f3d files/tork-0.08-geoip.patch 3233
 RMD160 963a714068ca409486d40f6dc2c3555bdad966d5 files/tork-0.08-geoip.patch 3233
 SHA256 bcc1f5fd7aca40cbf9a5a1d0f194620f62c517f9065610d637480047afeb7263 files/tork-0.08-geoip.patch 3233
+AUX tork-0.09-gcc41.patch 432 RMD160 c09cacf8d077bdb0673ac073984befa7f191677e SHA1 2477b32421857caff93cd0b850cf476ca0fd3768 SHA256 d04afd47ca38b350457042929b25739d1645a70f62f91a52db5114bffe705765
+MD5 8d025f4feef92182553761b771d33507 files/tork-0.09-gcc41.patch 432
+RMD160 c09cacf8d077bdb0673ac073984befa7f191677e files/tork-0.09-gcc41.patch 432
+SHA256 d04afd47ca38b350457042929b25739d1645a70f62f91a52db5114bffe705765 files/tork-0.09-gcc41.patch 432
 DIST tork-0.08.tar.bz2 1432911 RMD160 8388ea08e57829f42a49ef88ece9031d4367f894 SHA1 66b966e8426cf433854a472398105bdedbf295af SHA256 86e4463afdc50d0b384bffca64035960342cf0d21c851b9655f80153cd9403ba
+DIST tork-0.09.tar.bz2 1900253 RMD160 42cc5bc8dc13b5afe9d29c3b405e388b6aa7c0f5 SHA1 6788fd8118216933ac5b437c439dade940282346 SHA256 1b572e429db34421f94916830ca7347df228235b6e31d22913f67fb12d9b33fb
 EBUILD tork-0.08.ebuild 868 RMD160 9f8771ca61bdcccb8deefa7b9b076247f62dddc4 SHA1 2e584e6e816d8c7b0b198bf22e7cd79b762833d6 SHA256 4fd586a33fa7d8ce33f9e8e1d4b2da39bb8596c7ce2af480de26867d17deaa74
 MD5 b86a9bd84a12cf2e260456cfd8522740 tork-0.08.ebuild 868
 RMD160 9f8771ca61bdcccb8deefa7b9b076247f62dddc4 tork-0.08.ebuild 868
 SHA256 4fd586a33fa7d8ce33f9e8e1d4b2da39bb8596c7ce2af480de26867d17deaa74 tork-0.08.ebuild 868
-MISC ChangeLog 1446 RMD160 d0e5885942f5b936ba15831e4bbd5816541554de SHA1 0c45a1d38a1fe88fdce9d0b2438bd2b1e9213b04 SHA256 7a328a1f84f736f272af2514fe677025540a18bf2f5520be5413da1919cee1ff
-MD5 2f8d5548298c920c2b79cbe59a0a957d ChangeLog 1446
-RMD160 d0e5885942f5b936ba15831e4bbd5816541554de ChangeLog 1446
-SHA256 7a328a1f84f736f272af2514fe677025540a18bf2f5520be5413da1919cee1ff ChangeLog 1446
+EBUILD tork-0.09.ebuild 754 RMD160 1c867f6c99db8528b9c23dd711d950f99f9b59fc SHA1 3e390fe4a6daf436360890f02ac3688f696fa509 SHA256 65badc15dfd642f9fc1ecd5aa8112ac6e64430bf724f0b759a806c9250ae03e4
+MD5 70ff69b8b3819d1ffa43cd654a454b7d tork-0.09.ebuild 754
+RMD160 1c867f6c99db8528b9c23dd711d950f99f9b59fc tork-0.09.ebuild 754
+SHA256 65badc15dfd642f9fc1ecd5aa8112ac6e64430bf724f0b759a806c9250ae03e4 tork-0.09.ebuild 754
+MISC ChangeLog 1688 RMD160 9a6827646e29948e33e4706828a3663190bd0e55 SHA1 4782347b04fa2affbae4c9b63179896d982e2b97 SHA256 f1fee5876dbe7a55908d5a2042252f6a853a3a8aa8c9172a69408ce06876eeb5
+MD5 801b96d8388453d67848775df0bfe4f3 ChangeLog 1688
+RMD160 9a6827646e29948e33e4706828a3663190bd0e55 ChangeLog 1688
+SHA256 f1fee5876dbe7a55908d5a2042252f6a853a3a8aa8c9172a69408ce06876eeb5 ChangeLog 1688
 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
@@ -25,10 +34,13 @@ SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata
 MD5 47a17fbd8e2f4a707aa660ce2229e3fc files/digest-tork-0.08 235
 RMD160 fca00763dd9a5cebf4e15badb320b090a00d09e7 files/digest-tork-0.08 235
 SHA256 240b6de97513e840056fed9eb4be6f8b2328d71e01947cead636dcb952f9bfa0 files/digest-tork-0.08 235
+MD5 7e25c05e4fabcaf8ddb982838d10b6a4 files/digest-tork-0.09 235
+RMD160 db3bc75b4586357b03605c06f2b0084870dafd93 files/digest-tork-0.09 235
+SHA256 3252282dd34de19c15ca01858c560c6f8c177dc412e4d6ff222e93b0d15644a3 files/digest-tork-0.09 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD4DBQFFHl1IAiZjviIA2XgRAij0AJdtZQvWZbCyQJiK2PxskKOyc4SHAJ9gMdFz
-FbgsxTyO2BSqnSRcXaF+LQ==
-=9OO6
+iD8DBQFFNtHbAiZjviIA2XgRAkzQAJ0Yg76F7zbZQM0WPi5+8m1/qDr6gACgpP7D
+FbCnUYUeCgSoACcKcedOn1Y=
+=o1Ed
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/tork/files/digest-tork-0.09 b/kde-misc/tork/files/digest-tork-0.09
new file mode 100644
index 000000000000..aaf2990f1a4b
--- /dev/null
+++ b/kde-misc/tork/files/digest-tork-0.09
@@ -0,0 +1,3 @@
+MD5 81f948988302538c15f1978d12c72378 tork-0.09.tar.bz2 1900253
+RMD160 42cc5bc8dc13b5afe9d29c3b405e388b6aa7c0f5 tork-0.09.tar.bz2 1900253
+SHA256 1b572e429db34421f94916830ca7347df228235b6e31d22913f67fb12d9b33fb tork-0.09.tar.bz2 1900253
diff --git a/kde-misc/tork/files/tork-0.09-gcc41.patch b/kde-misc/tork/files/tork-0.09-gcc41.patch
new file mode 100644
index 000000000000..a28b6fbc47ff
--- /dev/null
+++ b/kde-misc/tork/files/tork-0.09-gcc41.patch
@@ -0,0 +1,13 @@
+Index: tork-0.09/src/tork.h
+===================================================================
+--- tork-0.09.orig/src/tork.h
++++ tork-0.09/src/tork.h
+@@ -88,7 +88,7 @@ public:
+     KSystemTray *_tray;
+     torkView *m_view;
+     QDict<QListViewItem> inodes;
+-    bool tork::connectedToTor(){return (client!=0) ? true : false;};
++    bool connectedToTor(){return (client!=0) ? true : false;};
+ 
+ private slots:
+     void fileNew();
diff --git a/kde-misc/tork/tork-0.09.ebuild b/kde-misc/tork/tork-0.09.ebuild
new file mode 100644
index 000000000000..1d98fd8be9f8
--- /dev/null
+++ b/kde-misc/tork/tork-0.09.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.09.ebuild,v 1.1 2006/10/19 01:15:51 flameeyes Exp $
+
+inherit kde
+
+DESCRIPTION="A Tor controller for the KDE desktop"
+HOMEPAGE="http://tork.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/geoip-1.4.0"
+
+RDEPEND="net-misc/tor
+	>=net-proxy/privoxy-3.0.3-r5
+	${DEPEND}"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-gcc41.patch"
+
+src_compile() {
+	local myconf="--with-external-geoip"
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	rm -rf "${D}/usr/share/applnk"
+}