diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-11-14 12:27:22 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-11-14 12:27:22 +0000 |
commit | c7423d53332af849dbfa6c3dbfcf452ac256ec7e (patch) | |
tree | eaa68000778942c6987cf526362a7e96316e311f /kde-misc | |
parent | Version bump, add dependency over tsocks (that upstream ships and builds inli... (diff) | |
download | gentoo-2-c7423d53332af849dbfa6c3dbfcf452ac256ec7e.tar.gz gentoo-2-c7423d53332af849dbfa6c3dbfcf452ac256ec7e.tar.bz2 gentoo-2-c7423d53332af849dbfa6c3dbfcf452ac256ec7e.zip |
Version bump, add dependency over tsocks (that upstream ships and builds inline), and remove old versions.
(Portage version: 2.1.2_rc1-r6)
(Signed Manifest commit)
Diffstat (limited to 'kde-misc')
-rw-r--r-- | kde-misc/tork/Manifest | 50 | ||||
-rw-r--r-- | kde-misc/tork/files/digest-tork-0.08 | 3 | ||||
-rw-r--r-- | kde-misc/tork/files/digest-tork-0.09 | 3 | ||||
-rw-r--r-- | kde-misc/tork/files/tork-0.08-crash.patch | 15 | ||||
-rw-r--r-- | kde-misc/tork/files/tork-0.08-geoip.patch | 115 | ||||
-rw-r--r-- | kde-misc/tork/tork-0.08.ebuild | 37 | ||||
-rw-r--r-- | kde-misc/tork/tork-0.09.ebuild | 33 |
7 files changed, 19 insertions, 237 deletions
diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest index b6c1664e6259..0793704d088e 100644 --- a/kde-misc/tork/Manifest +++ b/kde-misc/tork/Manifest @@ -1,50 +1,38 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX tork-0.08-crash.patch 672 RMD160 3c1cb22e891b99383865b4f5b89f63334878d041 SHA1 dc712a87c680eeaaad3cc937237a3c8a8fff38b9 SHA256 f47fc7daa45a54386a991a7874f6ca70bb282633b9825479a570567d8e75f0a8 -MD5 2fad2f59fdc4ff0fc15f2030086e9692 files/tork-0.08-crash.patch 672 -RMD160 3c1cb22e891b99383865b4f5b89f63334878d041 files/tork-0.08-crash.patch 672 -SHA256 f47fc7daa45a54386a991a7874f6ca70bb282633b9825479a570567d8e75f0a8 files/tork-0.08-crash.patch 672 -AUX tork-0.08-geoip.patch 3233 RMD160 963a714068ca409486d40f6dc2c3555bdad966d5 SHA1 ea850cdf6abffd0341c528ca9fdb853a31120602 SHA256 bcc1f5fd7aca40cbf9a5a1d0f194620f62c517f9065610d637480047afeb7263 -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 -DIST tork-0.08.tar.bz2 1432911 RMD160 8388ea08e57829f42a49ef88ece9031d4367f894 SHA1 66b966e8426cf433854a472398105bdedbf295af SHA256 86e4463afdc50d0b384bffca64035960342cf0d21c851b9655f80153cd9403ba -DIST tork-0.09.tar.bz2 1900835 RMD160 67d51ac8561a0a3ac3b1b21230145baf3e046cee SHA1 8fb9691e34474f4384cd6dfddc780afc394c47c5 SHA256 db5c5afcd69ba449ee734bd57827c01595c7ec077c69ab186529beca59257181 +AUX tork-0.11-external-tsocks.patch 1135 RMD160 1ea931405b6470b3009c93a78e074d8248595c1c SHA1 7a82dcd9ff26ace334a43b64036c1ba84190afb5 SHA256 dc8dd096c0b336fa71adeb1f93d359aea472cb6f5d69100d5bcc91b4559dd71e +MD5 b3f734c3c364f34c4823171fe9825f3e files/tork-0.11-external-tsocks.patch 1135 +RMD160 1ea931405b6470b3009c93a78e074d8248595c1c files/tork-0.11-external-tsocks.patch 1135 +SHA256 dc8dd096c0b336fa71adeb1f93d359aea472cb6f5d69100d5bcc91b4559dd71e files/tork-0.11-external-tsocks.patch 1135 DIST tork-0.10.tar.bz2 1900356 RMD160 61b4c24239d34b3a9a5519b390ae8d4f767aceaa SHA1 b5d203d7afc40c8112b9f69384ba347170e0a5df SHA256 4721123bbad9ce3a086b9f3d8ed39219cf363dbfcb8cea90c4b170f46bccff58 -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 -EBUILD tork-0.09.ebuild 714 RMD160 becf9b7dd97ca3c93721e2003f31c11b02e730c5 SHA1 fc012b591679e6c63bce5cdbbf7b164b92260e44 SHA256 da1651972dce84b55aa4aa90db69e4c5b5d155cba0ee9cd82ba2cd9bf257ea57 -MD5 f9778c9185b90637a5fd1ec0e76bc28c tork-0.09.ebuild 714 -RMD160 becf9b7dd97ca3c93721e2003f31c11b02e730c5 tork-0.09.ebuild 714 -SHA256 da1651972dce84b55aa4aa90db69e4c5b5d155cba0ee9cd82ba2cd9bf257ea57 tork-0.09.ebuild 714 +DIST tork-0.11.tar.bz2 1970291 RMD160 991c50023826e2b0dd780a8806b9f02b8c5de3d0 SHA1 fad1cc3257682f57f44d149fc471505f7f714fee SHA256 7325494586577492a4b66eca01a646bfa70c86844ed9d04486abf4e84107086c EBUILD tork-0.10.ebuild 714 RMD160 af569cf1c12588bf441eefc5ce999fcc6decd80d SHA1 498fefebf24aaadc34938f08a0d37fc5c1f6f333 SHA256 31536dea1990316bd8ea9db644dea3bf0f397056b3fb8f65b817d0eea5926a29 MD5 71cc7e4f09518a66e1b54e7c3c59c066 tork-0.10.ebuild 714 RMD160 af569cf1c12588bf441eefc5ce999fcc6decd80d tork-0.10.ebuild 714 SHA256 31536dea1990316bd8ea9db644dea3bf0f397056b3fb8f65b817d0eea5926a29 tork-0.10.ebuild 714 -MISC ChangeLog 1996 RMD160 16e7c62f30e746f2b77b9b5da31a9f9471940790 SHA1 29583814a71324101c2559191b690dc22d297e7c SHA256 688730a0eb927248051ca61ebdaf0b3e4853d1eefa3c7bb0ba901b2435e59efb -MD5 f6c40f787a03df42f152dc7882f3a7ca ChangeLog 1996 -RMD160 16e7c62f30e746f2b77b9b5da31a9f9471940790 ChangeLog 1996 -SHA256 688730a0eb927248051ca61ebdaf0b3e4853d1eefa3c7bb0ba901b2435e59efb ChangeLog 1996 +EBUILD tork-0.11.ebuild 830 RMD160 867a1526b5d2d78f83bbb058b07ae74b521e2f4c SHA1 cad49742be208045734bd5349d0d10d70ee2f390 SHA256 ffb3cb4ebb82156cc4f7fc341b39ad3e973f15b0d723090e50424f565dfd7b83 +MD5 51ad16c8b72f630c7b9f25687d99c2bf tork-0.11.ebuild 830 +RMD160 867a1526b5d2d78f83bbb058b07ae74b521e2f4c tork-0.11.ebuild 830 +SHA256 ffb3cb4ebb82156cc4f7fc341b39ad3e973f15b0d723090e50424f565dfd7b83 tork-0.11.ebuild 830 +MISC ChangeLog 2350 RMD160 4cda4f3940dba1b28aefb434e2809a52674e9136 SHA1 e51f19760b1396062b616d1b85076bc24592e0d1 SHA256 0d99afe224b05732253dc821c4fb2b0f3592415e133d20996d45b52a2050339e +MD5 c9ab20ae30b47c0aab51696147fdee50 ChangeLog 2350 +RMD160 4cda4f3940dba1b28aefb434e2809a52674e9136 ChangeLog 2350 +SHA256 0d99afe224b05732253dc821c4fb2b0f3592415e133d20996d45b52a2050339e ChangeLog 2350 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254 SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata.xml 254 -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 7874de58c8a3f2b1a73ad7e17c922c00 files/digest-tork-0.09 235 -RMD160 d8040fe951416657f4f44872854beccbdcc067ec files/digest-tork-0.09 235 -SHA256 2f51ed3091ee58aeffcdbd8f680c6d6343bdefa07e618be32291b782c8c5e257 files/digest-tork-0.09 235 MD5 178068131b9be9b02bba37a71e7652a0 files/digest-tork-0.10 235 RMD160 c65610df186d519ea4b4d31c4d1e03c5aa74c8e7 files/digest-tork-0.10 235 SHA256 f76d179e64126103c8de005a74a30088eef35bf6fee85934a2fafbd1ff2e5af6 files/digest-tork-0.10 235 +MD5 016485fc164f5f2c26b12eb21359db15 files/digest-tork-0.11 235 +RMD160 b791d0c96f5f670dba2f794ebfe3dd8f30d776b2 files/digest-tork-0.11 235 +SHA256 2236ef5b7fe958852bd916237d2e3ce996f9e32d3d357cca015b7e8fe50d60c4 files/digest-tork-0.11 235 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFPnBJAiZjviIA2XgRAjnEAKDRTWTKnHkb/vm6dVTaw7Waxxw4ygCg3OH6 -CYTRho0LL3FxmvsaYMx7K6g= -=utkz +iD8DBQFFWbYlAiZjviIA2XgRAuoeAJ9Bm4iWXlE1KkIkQuZHRtdd+TK9eQCglsth +58zWgnRzZCincGxfo8QY61s= +=JJVP -----END PGP SIGNATURE----- diff --git a/kde-misc/tork/files/digest-tork-0.08 b/kde-misc/tork/files/digest-tork-0.08 deleted file mode 100644 index ed99373c6ae8..000000000000 --- a/kde-misc/tork/files/digest-tork-0.08 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fc4049606f8a380f392a0e80c763147b tork-0.08.tar.bz2 1432911 -RMD160 8388ea08e57829f42a49ef88ece9031d4367f894 tork-0.08.tar.bz2 1432911 -SHA256 86e4463afdc50d0b384bffca64035960342cf0d21c851b9655f80153cd9403ba tork-0.08.tar.bz2 1432911 diff --git a/kde-misc/tork/files/digest-tork-0.09 b/kde-misc/tork/files/digest-tork-0.09 deleted file mode 100644 index e4ed8ca2b5af..000000000000 --- a/kde-misc/tork/files/digest-tork-0.09 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b75508a67b29c5e5e29cb79a1e949aac tork-0.09.tar.bz2 1900835 -RMD160 67d51ac8561a0a3ac3b1b21230145baf3e046cee tork-0.09.tar.bz2 1900835 -SHA256 db5c5afcd69ba449ee734bd57827c01595c7ec077c69ab186529beca59257181 tork-0.09.tar.bz2 1900835 diff --git a/kde-misc/tork/files/tork-0.08-crash.patch b/kde-misc/tork/files/tork-0.08-crash.patch deleted file mode 100644 index ce5bae55eeda..000000000000 --- a/kde-misc/tork/files/tork-0.08-crash.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: tork-0.08/src/torservers.ui.h -=================================================================== ---- tork-0.08.orig/src/torservers.ui.h -+++ tork-0.08/src/torservers.ui.h -@@ -48,6 +48,10 @@ void TorServers::init() - - int cc = (*it).section("-",0,0).toInt(); - QString nick = (*it).section("-",1); -+ -+ if ( cc >= sizeof(GeoIP_country_name)/sizeof(GeoIP_country_name[0]) ) -+ continue; -+ - tm = new QListViewItem(ExcludeNodes,GeoIP_country_name[cc],nick); - tm->setPixmap(1,QPixmap(SmallIcon("tork_" + QString(GeoIP_country_code[cc]).lower()))); - if ((TorkConfig::excludeNodes().contains(nick)) || diff --git a/kde-misc/tork/files/tork-0.08-geoip.patch b/kde-misc/tork/files/tork-0.08-geoip.patch deleted file mode 100644 index 93100ef26563..000000000000 --- a/kde-misc/tork/files/tork-0.08-geoip.patch +++ /dev/null @@ -1,115 +0,0 @@ -Index: tork-0.08/configure.in.in -=================================================================== ---- tork-0.08.orig/configure.in.in -+++ tork-0.08/configure.in.in -@@ -209,22 +209,3 @@ if test "$ac_cv_openssl_linker_option" ! - LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS" - fi - -- --# - GeoIP -- --GEOVERSION=1.4.0 --PACKAGE=GeoIP --GEOIP_VERSION_INFO=`echo $GEOVERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'` --AC_SUBST(GEOIP_VERSION_INFO) -- --AC_ARG_WITH(city, --[ --with-city=\"no\" Enable/disable support for GeoIP City Edition. (yes)]) --if test "$with_city" = "no" ; then -- echo Disabling GeoIP City Edition support -- WITH_CITY=1 --else -- echo Enabling GeoIP City Edition support -- WITH_CITY=0 --fi --AC_SUBST(WITH_CITY) --AM_CONDITIONAL(WITH_CITY, test "$with_city" != "no") -Index: tork-0.08/src/Makefile.am -=================================================================== ---- tork-0.08.orig/src/Makefile.am -+++ tork-0.08/src/Makefile.am -@@ -4,7 +4,7 @@ - # of the other Makefile.am variables - bin_PROGRAMS = tork - --SUBDIRS=icons about arkollon GeoIP-1.4.0 . -+SUBDIRS=icons about arkollon . - - # set the include path for X, qt and KDE - INCLUDES = $(all_includes) -@@ -16,7 +16,7 @@ METASOURCES = AUTO - tork_LDFLAGS = $(KDE_RPATH) $(all_libraries) - - # the libraries to link against. --tork_LDADD = $(LIB_KFILE) $(LIB_KHTML) -L GeoIP-1.4.0/libGeoIP/libGeoIP.la -+tork_LDADD = $(LIB_KFILE) $(LIB_KHTML) -lGeoIP - - # which sources should be compiled for tork - tork_SOURCES = torkconfig.kcfgc main.cpp tork.cpp torkview.cpp torkview_base.ui \ -Index: tork-0.08/src/torkview.cpp -=================================================================== ---- tork-0.08.orig/src/torkview.cpp -+++ tork-0.08/src/torkview.cpp -@@ -30,7 +30,7 @@ - #include "portsandicons.h" - #include "torkconfig.h" - --#include "GeoIP-1.4.0/libGeoIP/GeoIP.h" -+#include "GeoIP.h" - - - #include "kdebug.h" -Index: tork-0.08/src/server.ui.h -=================================================================== ---- tork-0.08.orig/src/server.ui.h -+++ tork-0.08/src/server.ui.h -@@ -16,7 +16,7 @@ - #include <qpopupmenu.h> - #include <kiconloader.h> - --#include "GeoIP-1.4.0/libGeoIP/GeoIP.h" -+#include <GeoIP.h> - - void MyServer::init() - { -Index: tork-0.08/src/torclient.cpp -=================================================================== ---- tork-0.08.orig/src/torclient.cpp -+++ tork-0.08/src/torclient.cpp -@@ -21,7 +21,7 @@ - #include <assert.h> - #include <qfile.h> - --#include "GeoIP-1.4.0/libGeoIP/GeoIP.h" -+#include <GeoIP.h> - - - Client::Client( const QString &host, Q_UINT16 port ) -Index: tork-0.08/src/tork.cpp -=================================================================== ---- tork-0.08.orig/src/tork.cpp -+++ tork-0.08/src/tork.cpp -@@ -78,7 +78,8 @@ - #include <qhostaddress.h> - - --#include "GeoIP-1.4.0/libGeoIP/GeoIP.h" -+ -+#include <GeoIP.h> - - tork *kmain = 0L; - -Index: tork-0.08/src/torservers.ui.h -=================================================================== ---- tork-0.08.orig/src/torservers.ui.h -+++ tork-0.08/src/torservers.ui.h -@@ -16,7 +16,7 @@ - #include <kdebug.h> - #include <kiconloader.h> - --#include "GeoIP-1.4.0/libGeoIP/GeoIP.h" -+#include <GeoIP.h> - - typedef QMap<QString, QString> codemap; - QString ccode; diff --git a/kde-misc/tork/tork-0.08.ebuild b/kde-misc/tork/tork-0.08.ebuild deleted file mode 100644 index 18e664db2eb4..000000000000 --- a/kde-misc/tork/tork-0.08.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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.08.ebuild,v 1.1 2006/09/23 01:14:36 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="" -RDEPEND="net-misc/tor - dev-libs/openssl - >=dev-libs/geoip-1.4.0 - >=net-proxy/privoxy-3.0.3-r5" - -need-kde 3.5 - -PATCHES="${FILESDIR}/${P}-geoip.patch - ${FILESDIR}/${P}-crash.patch" - -src_unpack() { - kde_src_unpack - rm -rf "${S}/src/GeoIP-1.4.0" "${S}/configure" -} - -src_install() { - kde_src_install - rm -rf "${D}/usr/share/applnk" - - echo "Categories=Qt;KDE;Network;" >> "${D}/usr/share/applications/kde/tork.desktop" -} diff --git a/kde-misc/tork/tork-0.09.ebuild b/kde-misc/tork/tork-0.09.ebuild deleted file mode 100644 index db5fd5de7b41..000000000000 --- a/kde-misc/tork/tork-0.09.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# 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.2 2006/10/20 23:34:31 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 - -src_compile() { - local myconf="--with-external-geoip" - kde_src_compile -} - -src_install() { - kde_src_install - rm -rf "${D}/usr/share/applnk" -} |