From: Raúl Porcel Date: Sun, 21 Jan 2007 14:27:02 +0000 (+0000) Subject: Stable x86 to fix bug 147739, remove old, remove old patches X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e3b1d64b51fdf06a193a4bad623b8211dd02237;p=gentoo.git Stable x86 to fix bug 147739, remove old, remove old patches Package-Manager: portage-2.1.2-r1 --- diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog index 7759d6b68aee..cd23c868feb4 100644 --- a/net-p2p/gnunet/ChangeLog +++ b/net-p2p/gnunet/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-p2p/gnunet # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.52 2007/01/12 21:10:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.53 2007/01/21 14:27:02 armin76 Exp $ + + 21 Jan 2007; Raúl Porcel + -files/gnunet-ipv6-gentoo.patch, -files/gnunet-0.7.0d-nulludp.patch, + -gnunet-0.6.2b.ebuild, -gnunet-0.7.0d-r1.ebuild, gnunet-0.7.0e.ebuild: + Stable x86 to fix bug 147739, remove old, remove old patches *gnunet-0.7.0e (12 Jan 2007) diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest index ae8231a22836..69ed7f20dbb3 100644 --- a/net-p2p/gnunet/Manifest +++ b/net-p2p/gnunet/Manifest @@ -2,10 +2,6 @@ AUX gnunet 805 RMD160 7b464895de53b299b2ba0779e14fb7f85fe47697 SHA1 fc72f946add2 MD5 6113da0c1798ff38d8d4c1fd4c9dfbb6 files/gnunet 805 RMD160 7b464895de53b299b2ba0779e14fb7f85fe47697 files/gnunet 805 SHA256 657e8add8f4118f6e6cb5dd32a3e43b7965ef9f465d834a971ce1d7a32282a5f files/gnunet 805 -AUX gnunet-0.7.0d-nulludp.patch 1786 RMD160 b8c401f50cda123ad84253deb1faccbc4174577d SHA1 b7e601040e271dffa8eb4e0599bb5febea94f28c SHA256 fb30fdb2b7340448dc159dadb10f1db96742c46cdc7c00269499a54fe874baa1 -MD5 43a498d19d58d3154e9c5661cf4a5770 files/gnunet-0.7.0d-nulludp.patch 1786 -RMD160 b8c401f50cda123ad84253deb1faccbc4174577d files/gnunet-0.7.0d-nulludp.patch 1786 -SHA256 fb30fdb2b7340448dc159dadb10f1db96742c46cdc7c00269499a54fe874baa1 files/gnunet-0.7.0d-nulludp.patch 1786 AUX gnunet-2 795 RMD160 0f2e48d25bb67b7a96606706c7943ff8c8b8be63 SHA1 c7255274dd86be0485703951bfc0a03990949190 SHA256 8bd55e5724024dc994775204bb838d5c42476118d6a8d22cff71605f1a4ee42c MD5 6b621fbe5837e2d6fb1f9d79769ea0f4 files/gnunet-2 795 RMD160 0f2e48d25bb67b7a96606706c7943ff8c8b8be63 files/gnunet-2 795 @@ -14,39 +10,19 @@ AUX gnunet-download-manager.scm 13338 RMD160 a8eaa266c3cbc012fcce4a011ad410b7f06 MD5 7e0bb86547b0ad5e7744374d32c124f8 files/gnunet-download-manager.scm 13338 RMD160 a8eaa266c3cbc012fcce4a011ad410b7f0630482 files/gnunet-download-manager.scm 13338 SHA256 a49047daf991597c869e43d300808990e3edfdf4f814a3e18b08d763fa84d7aa files/gnunet-download-manager.scm 13338 -AUX gnunet-ipv6-gentoo.patch 1891 RMD160 5cc10163fde086e3d4e4f7f2f06a51a7f669267c SHA1 54656c72c6b24d99e1803dad54f439309fe601bf SHA256 9271f7bd4c40d26b10984b4f3b077eb1c8401a9ea7e78f12dcd374b4ec2f7482 -MD5 53aa63a0ddf902a57c6ac427560b9664 files/gnunet-ipv6-gentoo.patch 1891 -RMD160 5cc10163fde086e3d4e4f7f2f06a51a7f669267c files/gnunet-ipv6-gentoo.patch 1891 -SHA256 9271f7bd4c40d26b10984b4f3b077eb1c8401a9ea7e78f12dcd374b4ec2f7482 files/gnunet-ipv6-gentoo.patch 1891 -DIST GNUnet-0.6.2b.tar.bz2 980714 RMD160 6bcf1f1a12b1a15c745bea1fbe0c77f450613907 SHA1 258c8cd3574f6b61fea45c323b0ae5b1e0d0639d SHA256 015dc02aef8ea748723829d27b76c03fe48dc685082e858a9f48bcdf493d02e4 -DIST GNUnet-0.7.0d.tar.bz2 1371958 RMD160 b00d19a326ca0ae92641b89d3039f02782b286d6 SHA1 9b9d004c45b59b2176651713927da1d6b504e28a SHA256 990c00d41cb31b52ca30e54ad833327e73f22eca602fdb374bbf1e3eebe0ee33 DIST GNUnet-0.7.0e.tar.bz2 1405884 RMD160 210a6a4eee385f76f4bc34816fe7e15812f8a227 SHA1 bb13eeeb057f18fe9f226630e5cf30f2d6296e2d SHA256 eea28505a825ce7404300c9dae25a7ebefbc681fc32082db0f92191ab7e14f18 -EBUILD gnunet-0.6.2b.ebuild 1607 RMD160 5f5c3a622e2db75b03a03641d63e633680c4ca24 SHA1 21b9f3a9e73b0303e1375e501182d7e04d0e61bf SHA256 94fd30976ec7911bd8637a7031a5b8ef4f4604912d060ff99fdcd9edf9aa4375 -MD5 735e6b14010d8ebd8b2f61cc8d53a03b gnunet-0.6.2b.ebuild 1607 -RMD160 5f5c3a622e2db75b03a03641d63e633680c4ca24 gnunet-0.6.2b.ebuild 1607 -SHA256 94fd30976ec7911bd8637a7031a5b8ef4f4604912d060ff99fdcd9edf9aa4375 gnunet-0.6.2b.ebuild 1607 -EBUILD gnunet-0.7.0d-r1.ebuild 3165 RMD160 c6f25daf5ca883a3a3cf29954dcdccd23ad44e59 SHA1 b822f5b87b7c48a4fe83f39ed6ea49a0e92c6458 SHA256 7142fdb509c5294b88692cd296cce9bd9caef44a2092b6ad9f08d64bfc7e0870 -MD5 48f0e02649513829396076ef82e36fd2 gnunet-0.7.0d-r1.ebuild 3165 -RMD160 c6f25daf5ca883a3a3cf29954dcdccd23ad44e59 gnunet-0.7.0d-r1.ebuild 3165 -SHA256 7142fdb509c5294b88692cd296cce9bd9caef44a2092b6ad9f08d64bfc7e0870 gnunet-0.7.0d-r1.ebuild 3165 -EBUILD gnunet-0.7.0e.ebuild 3126 RMD160 662c3b81bd5e7ce0defbd5e13e7aa9d4b31b388b SHA1 9c1a2036c1625943d1341fcf62a325dfeaf3dc71 SHA256 f628f497b5634b73b60e18b454d0fd8b26e187fb16d5f0435af9065775d678a2 -MD5 720d36a87c8c60488e87632f2fb28c14 gnunet-0.7.0e.ebuild 3126 -RMD160 662c3b81bd5e7ce0defbd5e13e7aa9d4b31b388b gnunet-0.7.0e.ebuild 3126 -SHA256 f628f497b5634b73b60e18b454d0fd8b26e187fb16d5f0435af9065775d678a2 gnunet-0.7.0e.ebuild 3126 -MISC ChangeLog 8245 RMD160 ac4f017e1fb4e5bce589c6fee729df82e90c0c8e SHA1 28aec7b2f4ef21669d2c0c7b8add7567a252f7e6 SHA256 4f210538177fc0e8005334ef2dd25bd2dc1d7e11ea44aab3e6f0f488031786a5 -MD5 067f6e7730f33992b0fb0f1817b7b58e ChangeLog 8245 -RMD160 ac4f017e1fb4e5bce589c6fee729df82e90c0c8e ChangeLog 8245 -SHA256 4f210538177fc0e8005334ef2dd25bd2dc1d7e11ea44aab3e6f0f488031786a5 ChangeLog 8245 +EBUILD gnunet-0.7.0e.ebuild 3125 RMD160 595d6bb630a0db5af01007a7e253bcaa83e07143 SHA1 9b259e021c99018e3bf18e894e0668347993184e SHA256 e15a0b2a8f334b3861877a4e0bb80727446107243175772a5fed5cdc31938a83 +MD5 bea1b9dc2fa9cec5284e960f829f1f4c gnunet-0.7.0e.ebuild 3125 +RMD160 595d6bb630a0db5af01007a7e253bcaa83e07143 gnunet-0.7.0e.ebuild 3125 +SHA256 e15a0b2a8f334b3861877a4e0bb80727446107243175772a5fed5cdc31938a83 gnunet-0.7.0e.ebuild 3125 +MISC ChangeLog 8502 RMD160 533d9831143f04364eea2e6a5a7fbf8f7624d514 SHA1 5c8349a089b8e99ec87721ca7734da3bbd0279d1 SHA256 fad8a464eed844ad52d4f052f1496a1d07b4488cd6ad787072264ed4a6f952c7 +MD5 74e93a07411fc78afedb6f243e4bd547 ChangeLog 8502 +RMD160 533d9831143f04364eea2e6a5a7fbf8f7624d514 ChangeLog 8502 +SHA256 fad8a464eed844ad52d4f052f1496a1d07b4488cd6ad787072264ed4a6f952c7 ChangeLog 8502 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160 -MD5 6ce9d92e8ab6a73cef4c8e29cce36c8c files/digest-gnunet-0.6.2b 244 -RMD160 bd97f84d83a7197cb229de8f774612691cd9136a files/digest-gnunet-0.6.2b 244 -SHA256 092786c4af78a5cd861245cbc788da345ddfae1568c32591307f4a510013b744 files/digest-gnunet-0.6.2b 244 -MD5 537107f4b66dea38ea029113603e8de7 files/digest-gnunet-0.7.0d-r1 247 -RMD160 45d0ebeb08c6fa5584b247089f1d2dc6cac8737d files/digest-gnunet-0.7.0d-r1 247 -SHA256 5a0df1570db2a84cf81a2232e7445616f6c132f41e6eb0c16849592f4c3c903e files/digest-gnunet-0.7.0d-r1 247 MD5 b9b9cff3cf80dde53786b0ed5cfcd72f files/digest-gnunet-0.7.0e 247 RMD160 6cf5276e62cdb9c843676f3e5b949ce48bffe120 files/digest-gnunet-0.7.0e 247 SHA256 04016c3b8db61048cb96a4047af07f98402beab567148ebe0d80e037248cb372 files/digest-gnunet-0.7.0e 247 diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.2b b/net-p2p/gnunet/files/digest-gnunet-0.6.2b deleted file mode 100644 index 0a353e597c4c..000000000000 --- a/net-p2p/gnunet/files/digest-gnunet-0.6.2b +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c3c8dcc940d3fdf35c0f606624362938 GNUnet-0.6.2b.tar.bz2 980714 -RMD160 6bcf1f1a12b1a15c745bea1fbe0c77f450613907 GNUnet-0.6.2b.tar.bz2 980714 -SHA256 015dc02aef8ea748723829d27b76c03fe48dc685082e858a9f48bcdf493d02e4 GNUnet-0.6.2b.tar.bz2 980714 diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0d-r1 b/net-p2p/gnunet/files/digest-gnunet-0.7.0d-r1 deleted file mode 100644 index 8d4042c25a97..000000000000 --- a/net-p2p/gnunet/files/digest-gnunet-0.7.0d-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c910ceb8acf02e8ef100951bf72ec71a GNUnet-0.7.0d.tar.bz2 1371958 -RMD160 b00d19a326ca0ae92641b89d3039f02782b286d6 GNUnet-0.7.0d.tar.bz2 1371958 -SHA256 990c00d41cb31b52ca30e54ad833327e73f22eca602fdb374bbf1e3eebe0ee33 GNUnet-0.7.0d.tar.bz2 1371958 diff --git a/net-p2p/gnunet/files/gnunet-0.7.0d-nulludp.patch b/net-p2p/gnunet/files/gnunet-0.7.0d-nulludp.patch deleted file mode 100644 index 5e666af21ec8..000000000000 --- a/net-p2p/gnunet/files/gnunet-0.7.0d-nulludp.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur GNUnet-0.7.0d.orig/src/transports/udp.c GNUnet-0.7.0d/src/transports/udp.c ---- GNUnet-0.7.0d.orig/src/transports/udp.c 2006-03-12 01:04:29.000000000 -0600 -+++ GNUnet-0.7.0d/src/transports/udp.c 2006-05-13 23:17:45.000000000 -0500 -@@ -247,7 +247,21 @@ - } - if (pending <= 0) { - LOG(LOG_WARNING, -- _("UDP: select returned, but ioctl reports 0 bytes available!\n")); -+ _("UDP: select returned, but ioctl reports %d bytes available!\n"), -+ pending); -+ if (pending == 0) { -+ /* maybe empty UDP packet was sent (see report on bug-gnunet, -+ 5/11/6; read 0 bytes from UDP just to kill potential empty packet! */ -+ memset(&incoming, -+ 0, -+ sizeof(struct sockaddr_in)); -+ RECVFROM(udp_sock, -+ NULL, -+ 0, -+ 0, -+ (struct sockaddr * )&incoming, -+ &addrlen); -+ } - continue; - } - if (pending >= 65536) { -diff -Naur GNUnet-0.7.0d.orig/src/transports/udp6.c GNUnet-0.7.0d/src/transports/udp6.c ---- GNUnet-0.7.0d.orig/src/transports/udp6.c 2006-03-11 15:32:00.000000000 -0600 -+++ GNUnet-0.7.0d/src/transports/udp6.c 2006-05-13 23:17:45.000000000 -0500 -@@ -230,6 +230,25 @@ - LOG_STRERROR(LOG_ERROR, "ioctl"); - continue; - } -+ if (pending <= 0) { -+ LOG(LOG_WARNING, -+ _("UDP6: select returned, but ioctl reports %d bytes available!\n"), -+ pending); -+ if (pending == 0) { -+ /* maybe empty UDP packet was sent (see report on bug-gnunet, -+ 5/11/6; read 0 bytes from UDP just to kill potential empty packet! */ -+ memset(&incoming, -+ 0, -+ sizeof(struct sockaddr_in6)); -+ RECVFROM(udp6_sock, -+ NULL, -+ 0, -+ 0, -+ (struct sockaddr * )&incoming, -+ &addrlen); -+ } -+ continue; -+ } - if (pending >= 65536) { - BREAK(); - continue; diff --git a/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch b/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch deleted file mode 100644 index acd779131aa6..000000000000 --- a/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur src/include/gnunet_util.h /tmp/GNUnet-0.6.6b/src/include/gnunet_util.h ---- src/include/gnunet_util.h 2005-02-28 00:43:33.000000000 +0100 -+++ /tmp/GNUnet-0.6.6b/src/include/gnunet_util.h 2005-08-03 14:35:23.000000000 +0200 -@@ -1067,7 +1067,7 @@ - * @param routeList a string specifying the forbidden networks - * @return the converted list, NULL if the synatx is flawed - */ --CIDR6Network * parseRoutes6(const char * routeList); -+CIDR6Network * parseRoutes6(char * routeList); - - - -diff -Naur src/transports/tcp6.c /tmp/GNUnet-0.6.6b/src/transports/tcp6.c ---- src/transports/tcp6.c 2005-01-26 02:58:46.000000000 +0100 -+++ /tmp/GNUnet-0.6.6b/src/transports/tcp6.c 2005-08-03 14:34:56.000000000 +0200 -@@ -825,6 +825,7 @@ - } - ok = SYSERR; - MUTEX_LOCK(&tcp6lock); -+ int sucess; - if (tcp6Session->wpos > 0) { - ret = 0; - } else { -diff -Naur src/transports/udp6.c /tmp/GNUnet-0.6.6b/src/transports/udp6.c ---- src/transports/udp6.c 2005-01-26 02:58:46.000000000 +0100 -+++ /tmp/GNUnet-0.6.6b/src/transports/udp6.c 2005-08-03 14:35:09.000000000 +0200 -@@ -275,6 +275,7 @@ - #endif - /* quick test of the packet, if failed, repeat! */ - if (size != ntohs(udp6m.size)) { -+ char * tmp = MALLOC(INET6_ADDRSTRLEN); - LOG(LOG_WARNING, - _("Packed received from %s:%d (UDP6) failed format check."), - inet_ntop(AF_INET6, -diff -Naur src/util/ipcheck.c /tmp/GNUnet-0.6.6b/src/util/ipcheck.c ---- src/util/ipcheck.c 2005-01-26 02:58:55.000000000 +0100 -+++ /tmp/GNUnet-0.6.6b/src/util/ipcheck.c 2005-08-03 14:34:41.000000000 +0200 -@@ -281,8 +281,8 @@ - * @param ip the IP to check (in network byte order) - * @return NO if the IP is not in the list, YES if it it is - */ --int checkIP6Listed(CIDR6Network * list, -- IP6addr * ip) { -+int checkIP6Listed(const CIDR6Network * list, -+ const IP6addr * ip) { - unsigned int i; - unsigned int j; - struct in6_addr zero; diff --git a/net-p2p/gnunet/gnunet-0.6.2b.ebuild b/net-p2p/gnunet/gnunet-0.6.2b.ebuild deleted file mode 100644 index 5fa3b22fd6ed..000000000000 --- a/net-p2p/gnunet/gnunet-0.6.2b.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.2b.ebuild,v 1.4 2006/11/23 17:30:57 vivo Exp $ - -inherit libtool - -S="${WORKDIR}/GNUnet-${PV}" -DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network." -HOMEPAGE="http://www.gnu.org/software/GNUnet/" -SRC_URI="mirror://gnu/${PN}/GNUnet-${PV}.tar.bz2" -RESTRICT="nomirror" - -IUSE="ipv6 gtk crypt mysql" - -KEYWORDS="x86 ~ppc" -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=dev-libs/openssl-0.9.6d - >=sys-libs/gdbm-1.8.0 - crypt? ( dev-libs/libgcrypt ) - gtk? ( =x11-libs/gtk+-1.2* ) - mysql? ( virtual/mysql ) - >=media-libs/libextractor-0.3.1" - -src_unpack() { - unpack ${A} - cp ${FILESDIR}/gnunet-download-manager.scm ${S}/contrib/ - cd ${S} -} - -src_compile() { - elibtoolize - - local myconf - - if ! use gtk; then - myconf="${myconf} --without-gtk" - fi - - if ! use crypt; then - myconf="${myconf} --without-gcrypt" - fi - - if ! use mysql; then - myconf="${myconf} --without-mysql" - fi - - econf ${myconf} `use_enable ipv6` || die - - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS ChangeLog PLATFORMS README UPDATING - insinto /etc - newins contrib/gnunet.root gnunet.conf - docinto contrib - dodoc contrib/* - exeinto /etc/init.d - doexe ${FILESDIR}/gnunet -} - -pkg_postinst() { - use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs" - einfo - einfo "now copy an appropriate config file from" - einfo "/usr/share/doc/${P}/contrib" - einfo "to ~/.gnunet/gnunet.conf" - einfo -} diff --git a/net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild b/net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild deleted file mode 100644 index d596ddbe942e..000000000000 --- a/net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild,v 1.6 2007/01/10 17:41:23 hkbst Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -S="${WORKDIR}/GNUnet-${PV}" -DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network." -HOMEPAGE="http://www.gnu.org/software/GNUnet/" -SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2" -#tests don't work -RESTRICT="test" - -IUSE="ipv6 mysql sqlite guile ncurses nls gtk" -KEYWORDS="~amd64 ~ppc ~sparc x86" -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=dev-libs/libgcrypt-1.2.0 - >=media-libs/libextractor-0.5.13 - >=dev-libs/gmp-4.0.0 - sys-libs/zlib - gtk? ( >=x11-libs/gtk+-2.6.10 ) - sys-apps/sed - ncurses? ( sys-libs/ncurses ) - mysql? ( >=virtual/mysql-4.0 ) - sqlite? ( >=dev-db/sqlite-3.0.8 ) - guile? ( >=dev-scheme/guile-1.6.0 ) - nls? ( sys-devel/gettext )" - - -pkg_setup() { - if ! use mysql && ! use sqlite; then - einfo - einfo "You need to specify at least one of 'mysql' or 'sqlite'" - einfo "USE flag in order to have properly installed gnunet" - einfo - die "Invalid USE flag set" - fi -} - -pkg_preinst() { - enewgroup gnunet || die "Problem adding gnunet group" - enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user" -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-nulludp.patch - - # make mysql default sqstore if we do not compile sql support - # (bug #107330) - ! use sqlite && \ - sed -i 's:default "sqstore_sqlite":default "sqstore_mysql":' \ - contrib/config-daemon.in - - # we do not want to built gtk support with USE=-gtk - if ! use gtk ; then - sed -i "s:AC_DEFINE_UNQUOTED..HAVE_GTK.*:true:" configure.ac - fi - - AT_M4DIR="${S}/m4" eautoreconf -} - -src_compile() { - - local myconf - - if use ipv6; then - if use amd64; then - ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled" - else - myconf="${myconf} --enable-ipv6" - fi - fi - - use mysql || myconf="${myconf} --without-mysql" - - econf \ - $(use_with sqlite) \ - $(use_enable nls) \ - $(use_enable ncurses) \ - $(use_enable guile) \ - ${myconf} || die "econf failed" - - emake -j1 || die "emake failed" -} - -src_install() { - make install DESTDIR=${D} || die "make install failed" - dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README README.fr UPDATING - insinto /etc - newins contrib/gnunet.root gnunet.conf - docinto contrib - dodoc contrib/* - exeinto /etc/init.d - newexe ${FILESDIR}/${PN}-2 gnunet - dodir /var/lib/GNUnet - chown gnunet:gnunet ${D}/var/lib/GNUnet -} - -pkg_postinst() { - # make sure permissions are ok - chown -R gnunet:gnunet /var/lib/GNUnet - - use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs" - einfo - einfo "To configure" - einfo " 1) Add user(s) to the gnunet group" - einfo " 2) Run 'gnunet-setup' to generate your client config file" - einfo " 3) Run gnunet-setup -d to generate a server config file" - einfo " 4) Optionally copy the .gnunet/gnunetd.conf into /etc and" - einfo "\tuse as a global server config file:" - einfo "$ gnunet-setup -d" - einfo "# cp ~/.gnunet/gnunetd.conf /etc/" - einfo -} - diff --git a/net-p2p/gnunet/gnunet-0.7.0e.ebuild b/net-p2p/gnunet/gnunet-0.7.0e.ebuild index a7ff34e8adce..e650c2bbe42a 100644 --- a/net-p2p/gnunet/gnunet-0.7.0e.ebuild +++ b/net-p2p/gnunet/gnunet-0.7.0e.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0e.ebuild,v 1.1 2007/01/12 21:10:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0e.ebuild,v 1.2 2007/01/21 14:27:02 armin76 Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2" RESTRICT="test" IUSE="ipv6 mysql sqlite guile ncurses nls gtk" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~sparc x86" LICENSE="GPL-2" SLOT="0"