aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/gnunet-gtk/Manifest1
-rw-r--r--net-misc/gnunet-gtk/gnunet-gtk-0.10.1_p20160501.ebuild (renamed from net-misc/gnunet-gtk/gnunet-gtk-0.10.2_rc1.ebuild)24
-rw-r--r--net-misc/gnunet-gtk/gnunet-gtk-9999.ebuild17
-rw-r--r--net-misc/gnunet/Manifest1
-rw-r--r--net-misc/gnunet/gnunet-0.10.1_p20160501.ebuild174
-rw-r--r--net-misc/gnunet/gnunet-0.10.2_rc1.ebuild171
-rw-r--r--net-misc/gnunet/gnunet-9999.ebuild54
-rw-r--r--net-misc/gnunet/metadata.xml2
8 files changed, 215 insertions, 229 deletions
diff --git a/net-misc/gnunet-gtk/Manifest b/net-misc/gnunet-gtk/Manifest
new file mode 100644
index 0000000..7d73d73
--- /dev/null
+++ b/net-misc/gnunet-gtk/Manifest
@@ -0,0 +1 @@
DIST gnunet-gtk-0.10.1_p20160501.tar.gz 12513280 SHA256 90ccdaf95e3f0012e85da54c21b4eb9bf2ebca06b6f56352f5143599fa0647d0 SHA512 975095c62020f10f696adcf61b986cfec01e634f2220382870671989f5b9bf5ef199dbb2b4c13c8bbf3a9c33b7424928cd3ec9d63573bc5ec1273ca45c54e897 WHIRLPOOL d30b08bb957c1206a29c907f7d421bcbd05362e8b359d63c03580a48652f31bdfbdfe9f125628368cf591317b928f32feedf9cafac559bad5062b5c5bac664e0
diff --git a/net-misc/gnunet-gtk/gnunet-gtk-0.10.2_rc1.ebuild b/net-misc/gnunet-gtk/gnunet-gtk-0.10.1_p20160501.ebuild
index c1ab1aa..f49b48c 100644
--- a/net-misc/gnunet-gtk/gnunet-gtk-0.10.2_rc1.ebuild
+++ b/net-misc/gnunet-gtk/gnunet-gtk-0.10.1_p20160501.ebuild
@@ -6,11 +6,9 @@ EAPI=6
6 6
7DESCRIPTION="Graphical front-end tools for GNUnet." 7DESCRIPTION="Graphical front-end tools for GNUnet."
8HOMEPAGE="https://gnunet.org/" 8HOMEPAGE="https://gnunet.org/"
9
10LICENSE="GPL-3" 9LICENSE="GPL-3"
11SLOT="0" 10SLOT="0"
12IUSE="" 11KEYWORDS="~amd64"
13KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
14 12
15DEPEND=">=x11-libs/gtk+-2.20.0 13DEPEND=">=x11-libs/gtk+-2.20.0
16 =net-misc/gnunet-${PV} 14 =net-misc/gnunet-${PV}
@@ -18,7 +16,6 @@ DEPEND=">=x11-libs/gtk+-2.20.0
18 dev-libs/libunique 16 dev-libs/libunique
19 dev-util/glade" 17 dev-util/glade"
20 18
21# autotools banned in EAPI 6
22if [[ ${PV} == "9999" ]] ; then 19if [[ ${PV} == "9999" ]] ; then
23 inherit autotools eutils subversion user 20 inherit autotools eutils subversion user
24 WANT_AUTOCONF="2.59" 21 WANT_AUTOCONF="2.59"
@@ -28,21 +25,10 @@ if [[ ${PV} == "9999" ]] ; then
28 SRC_URI="" 25 SRC_URI=""
29 ESVN_REPO_URI="https://gnunet.org/svn/gnunet-gtk" 26 ESVN_REPO_URI="https://gnunet.org/svn/gnunet-gtk"
30 ESVN_PROJECT="gnunet-gtk" 27 ESVN_PROJECT="gnunet-gtk"
31elif [[ ${PV} == "0.10.2_rc1" ]] ; then 28else
32 inherit autotools eutils subversion user 29 inherit user
33 WANT_AUTOCONF="2.59" 30 SRC_URI="mirror://gnu/gnunet/${P}.tar.gz"
34 WANT_AUTOMAKE="1.11"
35 WANT_LIBTOOL="2.2"
36 AUTOTOOLS_AUTORECONF=1
37 SRC_URI=""
38 ESVN_REPO_URI="https://gnunet.org/svn/gnunet-gtk"
39 ESVN_PROJECT="gnunet-gtk"
40 ESVN_REVISION=37011
41fi 31fi
42# else
43# inherit user
44# SRC_URI="mirror://gnu/gnunet/${P}.tar.gz"
45# fi
46 32
47src_prepare() { 33src_prepare() {
48 subversion_src_prepare 34 subversion_src_prepare
@@ -63,7 +49,7 @@ src_prepare() {
63# } 49# }
64 50
65src_configure() { 51src_configure() {
66 econf --with-gnunet=/usr 52 econf --with-gnunet="${ROOT}"/usr
67} 53}
68 54
69src_compile() { 55src_compile() {
diff --git a/net-misc/gnunet-gtk/gnunet-gtk-9999.ebuild b/net-misc/gnunet-gtk/gnunet-gtk-9999.ebuild
index 144790e..f49b48c 100644
--- a/net-misc/gnunet-gtk/gnunet-gtk-9999.ebuild
+++ b/net-misc/gnunet-gtk/gnunet-gtk-9999.ebuild
@@ -25,21 +25,10 @@ if [[ ${PV} == "9999" ]] ; then
25 SRC_URI="" 25 SRC_URI=""
26 ESVN_REPO_URI="https://gnunet.org/svn/gnunet-gtk" 26 ESVN_REPO_URI="https://gnunet.org/svn/gnunet-gtk"
27 ESVN_PROJECT="gnunet-gtk" 27 ESVN_PROJECT="gnunet-gtk"
28elif [[ ${PV} == "0.10.2_rc1" ]] ; then 28else
29 inherit autotools eutils subversion user 29 inherit user
30 WANT_AUTOCONF="2.59" 30 SRC_URI="mirror://gnu/gnunet/${P}.tar.gz"
31 WANT_AUTOMAKE="1.11"
32 WANT_LIBTOOL="2.2"
33 AUTOTOOLS_AUTORECONF=1
34 SRC_URI=""
35 ESVN_REPO_URI="https://gnunet.org/svn/gnunet-gtk"
36 ESVN_PROJECT="gnunet-gtk"
37 ESVN_REVISION=37011
38fi 31fi
39# else
40# inherit user
41# SRC_URI="mirror://gnu/gnunet/${P}.tar.gz"
42# fi
43 32
44src_prepare() { 33src_prepare() {
45 subversion_src_prepare 34 subversion_src_prepare
diff --git a/net-misc/gnunet/Manifest b/net-misc/gnunet/Manifest
new file mode 100644
index 0000000..fd645ce
--- /dev/null
+++ b/net-misc/gnunet/Manifest
@@ -0,0 +1 @@
DIST gnunet-0.10.1_p20160501.tar.gz 33198080 SHA256 c2832c14168592e03a6bfb9a2c455ab121d37a50f4c25e486b710c89a0eaab75 SHA512 bac84eb810eaa818567eb428fff4637f7385754788c6f5dde9bb69b18a7d5d499883cbf3431192d02feea8e9d33ecf631db857ded73c5f29a3ae02b17c42312f WHIRLPOOL 5d5aa96efbf25b564c44ec5700ff457d785fb3acaff15cb92bdf7778cd4df8edf14466679542ccaa7bf5e5bb5afd874550f6cab09849a78d2917f3bb2942af85
diff --git a/net-misc/gnunet/gnunet-0.10.1_p20160501.ebuild b/net-misc/gnunet/gnunet-0.10.1_p20160501.ebuild
new file mode 100644
index 0000000..5b1d71c
--- /dev/null
+++ b/net-misc/gnunet/gnunet-0.10.1_p20160501.ebuild
@@ -0,0 +1,174 @@
1# Copyright 1999-2016 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2
3# $Id$
4
5# taken from https://338909.bugs.gentoo.org/attachment.cgi?id=381924
6# referenced at https://bugs.gentoo.org/show_bug.cgi?id=338909
7# merged with 9999 variant from emery overlay
8# refined 2015-07 by carlo von lynX of youbroketheinternet.org
9# complete rewrite by ng0 (collective libertad)
10
11EAPI=6
12
13DESCRIPTION="Cryptographic GNU Mesh/Underlay Network Routing Layer"
14HOMEPAGE="https://gnunet.org/"
15LICENSE="GPL-3"
16PYTHON_COMPAT=( python2_7 ) # tests are not yet python3 compatible.
17
18if [[ "${PV}" == "9999" ]]; then
19 inherit eutils autotools subversion user python-any-r1
20 ESVN_REPO_URI="https://gnunet.org/svn/gnunet"
21 ESVN_PROJECT="gnunet"
22 WANT_AUTOCONF="2.59"
23 WANT_AUTOMAKE="1.11"
24 WANT_LIBTOOL="2.2"
25 AUTOTOOLS_AUTORECONF=1
26else
27 inherit eutils autotools subversion user python-any-r1
28 WANT_AUTOCONF="2.59"
29 WANT_AUTOMAKE="1.11"
30 WANT_LIBTOOL="2.2"
31 AUTOTOOLS_AUTORECONF=1
32 SRC_URI="mirror://gnu/gnunet/${P}.tar.gz"
33fi
34
35AUTOTOOLS_IN_SOURCE_BUILD=1
36KEYWORDS="~amd64"
37SLOT="0"
38IUSE="+httpd +sqlite postgresql mysql nls nss +X +gnutls +dane +bluetooth ssl experimental extra conversation pulseaudio gstreamer qr tex test hardened"
39# Current svn numbers no longer need to be patched.
40#if [[ ${PV} != "9999" ]] ; then
41# PATCHES=( "${FILESDIR}"/install.diff )
42#fi
43RESTRICT="test"
44REQUIRED_USE="?? ( mysql postgresql sqlite )
45 ?? ( pulseaudio gstreamer )"
46
47RDEPEND="
48 mysql? ( >=virtual/mysql-5.1 )
49 postgresql? ( >=dev-db/postgresql-8.3:= )
50 sqlite? ( >=dev-db/sqlite-3.0 )
51 >=net-misc/curl-7.21.0
52 >=media-libs/libextractor-0.6.1
53 >=dev-libs/libgcrypt-1.6
54 >=dev-libs/libunistring-0.9.3
55 >=net-misc/gnurl-7.34.0
56 gnutls? ( net-libs/gnutls )
57 dane? ( net-libs/gnutls[dane] )
58 ssl? ( dev-libs/openssl:0= )
59 net-dns/libidn
60 sys-libs/ncurses:0
61 sys-libs/zlib
62 httpd? ( >=net-libs/libmicrohttpd-0.9.42[messages] )
63 nls? ( >=sys-devel/gettext-0.18.1 )
64 nss? ( dev-libs/nss )
65 dev-libs/gmp:0=
66 X? (
67 x11-libs/libXt
68 x11-libs/libXext
69 x11-libs/libX11
70 x11-libs/libXrandr
71 )
72 dev-libs/jansson
73 >=sci-mathematics/glpk-4.43
74 extra? (
75 qr? ( >=media-gfx/zbar-0.10[python] )
76 tex? ( >=app-text/texlive-2012 )
77 conversation? (
78 gstreamer? (
79 media-libs/gstreamer:1.0
80 dev-libs/glib:2
81 )
82 pulseaudio? ( >=media-sound/pulseaudio-2.0 )
83 >=media-libs/opus-1.0.1
84 >=media-libs/libogg-1.3.0
85 )
86 )
87 bluetooth? ( net-wireless/bluez )
88 test? ( ${PYTHON_DEPS} )"
89#test? ( >=dev-lang/python-2.7:2.7 )
90
91DEPEND="
92 ${RDEPEND}"
93 #sys-devel/automake:1.14"
94
95MAKEOPTS="${MAKEOPTS} -j1"
96
97pkg_setup() {
98 enewgroup gnunetdns
99 enewgroup gnunet
100 enewuser "gnunet" -1 -1 /var/lib/gnunet "gnunet"
101 esethome "gnunet" /var/lib/gnunet
102}
103
104src_prepare() {
105 if [[ "${PV}" == "9999" ]]; then
106 subversion_src_prepare
107 rm -rf libltdl || die
108 eautoreconf
109 ./contrib/pogen.sh || die
110 default
111 else
112 # run what ./bootstrap would run:
113 rm -rf libltdl || die
114 eautoreconf
115 ./contrib/pogen.sh || die
116 default
117 fi
118}
119
120src_configure() {
121 econf \
122 --docdir="${EPREFIX}/usr/share/doc/${PF}" \
123 $(use_enable nls) \
124 $(use_enable experimental) \
125 $(use_with httpd microhttpd) \
126 $(use_with mysql) \
127 $(use_with postgresql) \
128 $(use_with sqlite) \
129 $(use_with X x) \
130 $(use_with gnutls) \
131 $(use_with bluetooth) \
132 --with-libextractor
133 # hardened build (untested)
134 use hardened && append-ldflags "--with-gcc-hardening --with-linker-hardening"
135}
136# debug those:
137#$(use_with ssl) \
138
139src_install() {
140 default
141 newinitd "${FILESDIR}"/gnunet.initd gnunet
142 insinto /etc/gnunet
143 doins "${FILESDIR}"/gnunet.conf
144 keepdir /var/{lib,log}/gnunet
145 fowners gnunet:gnunet /var/lib/gnunet /var/log/gnunet
146}
147
148pkg_postinst() {
149 # We should update the gtk icon cache for the icons.
150 elog "To configure"
151 elog " 1) Add desired user(s) to the 'gnunet' group"
152 elog " 2) Edit the system-wide config file '/etc/gnunet/gnunet.conf'"
153 elog " preferably using 'gnunet-setup -c /etc/gnunet/gnunet.conf'"
154 elog " ('gnunet-setup' is part of the gnunet-gtk package)"
155 elog " 3) You may want to choose other bootstrap nodes than the ones"
156 elog " provided in /usr/share/gnunet/hellos or remove them if you"
157 elog " want to run GNUnet another way."
158 elog " 4) Certain services will require '/dev/net/tun' to exist,"
159 elog " which you must enable in your kernel."
160 elog " "
161 elog "Optionally, emerge gnunet-gtk to get a GUI for file-sharing and"
162 elog "configuration. This is particularly recommended"
163 elog "if your network setup is non-trivial, as gnunet-setup can be"
164 elog "used to test in the GUI if your network configuration is working."
165 elog "gnunet-setup should be run as the \"gnunet\" user under X. As it"
166 elog "does very little with the network, running it as \"root\" is likely"
167 elog "also harmless. You can also run it as a normal user, but then"
168 elog "you have to copy \"~/.gnunet/gnunet.conf\" over to the \"gnunet\" user's"
169 elog "home directory in the end."
170 elog " "
171 elog "Once you have configured your peer, run (as the 'gnunet' user)"
172 elog "\"gnunet-arm -s\" to start the peer. You can then run the various"
173 elog "GNUnet-tools as your \"normal\" user (who should only be in the group 'gnunet')."
174}
diff --git a/net-misc/gnunet/gnunet-0.10.2_rc1.ebuild b/net-misc/gnunet/gnunet-0.10.2_rc1.ebuild
deleted file mode 100644
index 0ca136b..0000000
--- a/net-misc/gnunet/gnunet-0.10.2_rc1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
1# Copyright 1999-2016 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2
3# $Id$
4#
5# taken from https://338909.bugs.gentoo.org/attachment.cgi?id=381924
6# referenced at https://bugs.gentoo.org/show_bug.cgi?id=338909
7# merged with 9999 variant from emery overlay
8# refined 2015-07 by carlo von lynX of youbroketheinternet.org
9# tweaks since 2015-07 by ng0
10
11EAPI=6
12
13DESCRIPTION="Cryptographic GNU Mesh/Underlay Network Routing Layer"
14HOMEPAGE="https://gnunet.org/"
15LICENSE="GPL-3"
16
17# eapi 6 banned: autotools-utils
18if [[ ${PV} == "9999" ]] ; then
19 inherit eutils autotools subversion user
20 WANT_AUTOCONF="2.59"
21 WANT_AUTOMAKE="1.11"
22 WANT_LIBTOOL="2.2"
23 AUTOTOOLS_AUTORECONF=1
24 SRC_URI=""
25 ESVN_REPO_URI="https://gnunet.org/svn/gnunet"
26 ESVN_PROJECT="gnunet"
27elif [[ ${PV} == "0.10.2_rc1" ]] ; then
28 inherit eutils autotools subversion user
29 WANT_AUTOCONF="2.59"
30 WANT_AUTOMAKE="1.11"
31 WANT_LIBTOOL="2.2"
32 AUTOTOOLS_AUTORECONF=1
33 SRC_URI=""
34 ESVN_REPO_URI="https://gnunet.org/svn/gnunet"
35 ESVN_PROJECT="gnunet"
36 ESVN_REVISION=37011
37fi
38#else
39# inherit user eutils
40# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
41#fi
42
43AUTOTOOLS_IN_SOURCE_BUILD=1
44
45#https://lists.gnu.org/archive/html/gnunet-developers/2016-04/msg00013.html
46KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
47#RESTRICT="test" -> python-2.7 for tests.
48SLOT="0"
49IUSE="experimental extra +httpd mysql nls postgresql +sqlite X +gnutls conversation qr tex sudo +ssl +dane"
50
51#if [[ ${PV} != "9999" ]] ; then
52# PATCHES=( "${FILESDIR}"/install.diff )
53#fi
54
55REQUIRED_USE="
56 !mysql? ( !postgresql? ( sqlite ) )
57 !mysql? ( !sqlite? ( postgresql ) )
58 !postgresql? ( !mysql? ( sqlite ) )
59 !postgresql? ( !sqlite? ( mysql ) )
60 !sqlite? ( !postgresql? ( mysql ) )
61 !sqlite? ( !mysql? ( postgresql ) )"
62
63RDEPEND="
64 >=net-misc/curl-7.21.0
65 >=media-libs/libextractor-0.6.1
66 >=dev-libs/libgcrypt-1.6
67 >=dev-libs/libunistring-0.9.3
68 net-misc/gnurl
69 gnutls? ( net-libs/gnutls )
70 dane? ( net-libs/gnutls[dane] )
71 ssl? ( dev-libs/openssl:0= )
72 net-dns/libidn
73 sys-libs/ncurses:0
74 sys-libs/zlib
75 httpd? ( >=net-libs/libmicrohttpd-0.9.42[messages] )
76 mysql? ( >=virtual/mysql-5.1 )
77 nls? ( sys-devel/gettext )
78 postgresql? ( >=dev-db/postgresql-8.3:0 )
79 sqlite? ( >=dev-db/sqlite-3.0 )
80 dev-libs/gmp:0=
81 X? (
82 x11-libs/libXt
83 x11-libs/libXext
84 x11-libs/libX11
85 x11-libs/libXrandr
86 )
87 extra? (
88 dev-libs/jansson
89 qr? ( >=media-gfx/zbar-0.10[python] )
90 tex? ( >=app-text/texlive-2012 )
91 >=sci-mathematics/glpk-4.45
92 conversation? (
93 >=media-sound/pulseaudio-2.0
94 >=media-libs/opus-1.0.1
95 >=media-libs/libogg-1.3.0
96 )
97 )
98 sudo? ( app-admin/sudo )
99 >=dev-lang/python-2.7"
100
101DEPEND="
102 ${RDEPEND}
103 sys-devel/automake:1.14"
104
105MAKEOPTS="${MAKEOPTS} -j1"
106
107pkg_setup() {
108 enewgroup gnunetdns
109 enewgroup gnunet
110 enewuser "gnunet" -1 -1 /var/lib/gnunet "gnunet"
111 esethome "gnunet" /var/lib/gnunet
112}
113
114src_prepare() {
115 subversion_src_prepare
116 rm -rf libltdl || die
117 eautoreconf
118 ./contrib/pogen.sh || die
119 default
120 # if [[ ${PV} == "9999" ]] ; then
121 # subversion_src_prepare
122 # rm -rf libltdl || die
123 # eautoreconf
124 # ./contrib/pogen.sh || die
125 # default
126 # #autotools-utils_src_prepare
127 # #epatch_user
128 # else
129 # default
130 # fi
131}
132
133src_configure() {
134 econf \
135 --docdir="${EPREFIX}/usr/share/doc/${PF}" \
136 $(use_enable nls) \
137 $(use_enable experimental) \
138 $(use_with httpd microhttpd) \
139 $(use_with mysql) \
140 $(use_with postgresql) \
141 $(use_with sqlite) \
142 $(use_with X x) \
143 $(use_with gnutls)
144}
145# debug those:
146#$(use_with dane) \
147#$(use_with ssl) \
148#--with-gnunetdns=gnunetdns
149
150src_install() {
151 default
152 newinitd "${FILESDIR}/gnunet.initd" gnunet
153 insinto /etc/gnunet
154 doins "${FILESDIR}/gnunet.conf"
155 keepdir /var/{lib,log}/gnunet
156 fowners gnunet:gnunet /var/lib/gnunet /var/log/gnunet
157}
158
159pkg_postinst() {
160 gtk-update-icon-cache
161 einfo
162 einfo "To configure"
163 einfo " 1) Add actual user(s) to the gnunet group"
164 einfo " 2) Edit the system-wide config file '/etc/gnunet/gnunet.conf'"
165 einfo " preferably using 'gnunet-setup -c /etc/gnunet/gnunet.conf'"
166 einfo " ('gnunet-setup' is part of the gnunet-gtk package)"
167 einfo " 3) You may want to choose other bootstrap nodes than the ones"
168 einfo " provided in /usr/share/gnunet/hellos or remove them if you"
169 einfo " want to run GNUnet another way."
170 einfo
171}
diff --git a/net-misc/gnunet/gnunet-9999.ebuild b/net-misc/gnunet/gnunet-9999.ebuild
index 1bacd5f..5b1d71c 100644
--- a/net-misc/gnunet/gnunet-9999.ebuild
+++ b/net-misc/gnunet/gnunet-9999.ebuild
@@ -1,19 +1,19 @@
1# Copyright 1999-2016 Gentoo Foundation 1# Copyright 1999-2016 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Id$ 3# $Id$
4# 4
5# taken from https://338909.bugs.gentoo.org/attachment.cgi?id=381924 5# taken from https://338909.bugs.gentoo.org/attachment.cgi?id=381924
6# referenced at https://bugs.gentoo.org/show_bug.cgi?id=338909 6# referenced at https://bugs.gentoo.org/show_bug.cgi?id=338909
7# merged with 9999 variant from emery overlay 7# merged with 9999 variant from emery overlay
8# refined 2015-07 by carlo von lynX of youbroketheinternet.org 8# refined 2015-07 by carlo von lynX of youbroketheinternet.org
9# tweaks, complete rewrite since 2015-07 by ng0 9# complete rewrite by ng0 (collective libertad)
10 10
11EAPI=6 11EAPI=6
12 12
13DESCRIPTION="Cryptographic GNU Mesh/Underlay Network Routing Layer" 13DESCRIPTION="Cryptographic GNU Mesh/Underlay Network Routing Layer"
14HOMEPAGE="https://gnunet.org/" 14HOMEPAGE="https://gnunet.org/"
15LICENSE="GPL-3" 15LICENSE="GPL-3"
16PYTHON_COMPAT=( python2_7 ) #rest needs to be tested 16PYTHON_COMPAT=( python2_7 ) # tests are not yet python3 compatible.
17 17
18if [[ "${PV}" == "9999" ]]; then 18if [[ "${PV}" == "9999" ]]; then
19 inherit eutils autotools subversion user python-any-r1 19 inherit eutils autotools subversion user python-any-r1
@@ -29,34 +29,28 @@ else
29 WANT_AUTOMAKE="1.11" 29 WANT_AUTOMAKE="1.11"
30 WANT_LIBTOOL="2.2" 30 WANT_LIBTOOL="2.2"
31 AUTOTOOLS_AUTORECONF=1 31 AUTOTOOLS_AUTORECONF=1
32 SRC_URI="mirror://gentoo/${P}.tar.gz 32 SRC_URI="mirror://gnu/gnunet/${P}.tar.gz"
33 https://libertad.pw/static/${PN}-${PV}.tar.gz"
34 #intended temporary place, also later moved to code.*
35 #old/upstream: mirror://gnu/${PN}/${P}.tar.gz
36fi 33fi
34
37AUTOTOOLS_IN_SOURCE_BUILD=1 35AUTOTOOLS_IN_SOURCE_BUILD=1
38KEYWORDS="~amd64" 36KEYWORDS="~amd64"
39SLOT="0" 37SLOT="0"
40IUSE="+httpd +sqlite postgresql mysql nls nss +X +gnutls +dane +bluetooth ssl experimental extra conversation pulseaudio gstreamer qr tex test" 38IUSE="+httpd +sqlite postgresql mysql nls nss +X +gnutls +dane +bluetooth ssl experimental extra conversation pulseaudio gstreamer qr tex test hardened"
41# With current svn numbers this is no longer needed. 39# Current svn numbers no longer need to be patched.
42#if [[ ${PV} != "9999" ]] ; then 40#if [[ ${PV} != "9999" ]] ; then
43# PATCHES=( "${FILESDIR}"/install.diff ) 41# PATCHES=( "${FILESDIR}"/install.diff )
44#fi 42#fi
45RESTRICT="test" # how is running tests handled in this case in gentoo? 43RESTRICT="test"
46REQUIRED_USE="?? ( mysql postgresql sqlite ) 44REQUIRED_USE="?? ( mysql postgresql sqlite )
47 ?? ( pulseaudio gstreamer )" 45 ?? ( pulseaudio gstreamer )"
48 46
49# note for gentoo-hardened:
50# might be possible to build with
51# "--with-gcc-hardening" and "--with-linker-hardening"
52
53RDEPEND=" 47RDEPEND="
54 mysql? ( >=virtual/mysql-5.1 ) 48 mysql? ( >=virtual/mysql-5.1 )
55 postgresql? ( >=dev-db/postgresql-8.3:= ) 49 postgresql? ( >=dev-db/postgresql-8.3:= )
56 sqlite? ( >=dev-db/sqlite-3.0 ) 50 sqlite? ( >=dev-db/sqlite-3.0 )
57 >=net-misc/curl-7.21.0 51 >=net-misc/curl-7.21.0
58 >=media-libs/libextractor-0.6.1 52 >=media-libs/libextractor-0.6.1
59 >=dev-libs/libgcrypt-1.7 53 >=dev-libs/libgcrypt-1.6
60 >=dev-libs/libunistring-0.9.3 54 >=dev-libs/libunistring-0.9.3
61 >=net-misc/gnurl-7.34.0 55 >=net-misc/gnurl-7.34.0
62 gnutls? ( net-libs/gnutls ) 56 gnutls? ( net-libs/gnutls )
@@ -83,7 +77,8 @@ RDEPEND="
83 conversation? ( 77 conversation? (
84 gstreamer? ( 78 gstreamer? (
85 media-libs/gstreamer:1.0 79 media-libs/gstreamer:1.0
86 dev-libs/glib:2 ) 80 dev-libs/glib:2
81 )
87 pulseaudio? ( >=media-sound/pulseaudio-2.0 ) 82 pulseaudio? ( >=media-sound/pulseaudio-2.0 )
88 >=media-libs/opus-1.0.1 83 >=media-libs/opus-1.0.1
89 >=media-libs/libogg-1.3.0 84 >=media-libs/libogg-1.3.0
@@ -100,13 +95,12 @@ DEPEND="
100MAKEOPTS="${MAKEOPTS} -j1" 95MAKEOPTS="${MAKEOPTS} -j1"
101 96
102pkg_setup() { 97pkg_setup() {
98 enewgroup gnunetdns
103 enewgroup gnunet 99 enewgroup gnunet
104 enewuser "gnunet" -1 -1 /var/lib/gnunet "gnunet" 100 enewuser "gnunet" -1 -1 /var/lib/gnunet "gnunet"
105 esethome "gnunet" /var/lib/gnunet 101 esethome "gnunet" /var/lib/gnunet
106} 102}
107 103
108# Technically it is a svn checkout, just to be sure
109# we run what ./bootstrap would do.
110src_prepare() { 104src_prepare() {
111 if [[ "${PV}" == "9999" ]]; then 105 if [[ "${PV}" == "9999" ]]; then
112 subversion_src_prepare 106 subversion_src_prepare
@@ -115,6 +109,7 @@ src_prepare() {
115 ./contrib/pogen.sh || die 109 ./contrib/pogen.sh || die
116 default 110 default
117 else 111 else
112 # run what ./bootstrap would run:
118 rm -rf libltdl || die 113 rm -rf libltdl || die
119 eautoreconf 114 eautoreconf
120 ./contrib/pogen.sh || die 115 ./contrib/pogen.sh || die
@@ -135,13 +130,14 @@ src_configure() {
135 $(use_with gnutls) \ 130 $(use_with gnutls) \
136 $(use_with bluetooth) \ 131 $(use_with bluetooth) \
137 --with-libextractor 132 --with-libextractor
133 # hardened build (untested)
134 use hardened && append-ldflags "--with-gcc-hardening --with-linker-hardening"
138} 135}
139# debug those: 136# debug those:
140#$(use_with ssl) \ 137#$(use_with ssl) \
141 138
142src_install() { 139src_install() {
143 default 140 default
144 #newinitd "${FILESDIR}/gnunet.initd" gnunet
145 newinitd "${FILESDIR}"/gnunet.initd gnunet 141 newinitd "${FILESDIR}"/gnunet.initd gnunet
146 insinto /etc/gnunet 142 insinto /etc/gnunet
147 doins "${FILESDIR}"/gnunet.conf 143 doins "${FILESDIR}"/gnunet.conf
@@ -150,8 +146,7 @@ src_install() {
150} 146}
151 147
152pkg_postinst() { 148pkg_postinst() {
153 einfo "Updating GTK icon cache" 149 # We should update the gtk icon cache for the icons.
154 gtk-update-icon-cache #does not work somehow.
155 elog "To configure" 150 elog "To configure"
156 elog " 1) Add desired user(s) to the 'gnunet' group" 151 elog " 1) Add desired user(s) to the 'gnunet' group"
157 elog " 2) Edit the system-wide config file '/etc/gnunet/gnunet.conf'" 152 elog " 2) Edit the system-wide config file '/etc/gnunet/gnunet.conf'"
@@ -162,7 +157,18 @@ pkg_postinst() {
162 elog " want to run GNUnet another way." 157 elog " want to run GNUnet another way."
163 elog " 4) Certain services will require '/dev/net/tun' to exist," 158 elog " 4) Certain services will require '/dev/net/tun' to exist,"
164 elog " which you must enable in your kernel." 159 elog " which you must enable in your kernel."
165 elog "" 160 elog " "
166 elog " For further troubleshooting and info, take a look at the wiki" 161 elog "Optionally, emerge gnunet-gtk to get a GUI for file-sharing and"
167 elog " page about gnunet." 162 elog "configuration. This is particularly recommended"
163 elog "if your network setup is non-trivial, as gnunet-setup can be"
164 elog "used to test in the GUI if your network configuration is working."
165 elog "gnunet-setup should be run as the \"gnunet\" user under X. As it"
166 elog "does very little with the network, running it as \"root\" is likely"
167 elog "also harmless. You can also run it as a normal user, but then"
168 elog "you have to copy \"~/.gnunet/gnunet.conf\" over to the \"gnunet\" user's"
169 elog "home directory in the end."
170 elog " "
171 elog "Once you have configured your peer, run (as the 'gnunet' user)"
172 elog "\"gnunet-arm -s\" to start the peer. You can then run the various"
173 elog "GNUnet-tools as your \"normal\" user (who should only be in the group 'gnunet')."
168} 174}
diff --git a/net-misc/gnunet/metadata.xml b/net-misc/gnunet/metadata.xml
index e936f49..f77f5d0 100644
--- a/net-misc/gnunet/metadata.xml
+++ b/net-misc/gnunet/metadata.xml
@@ -34,6 +34,6 @@
34 <flag name='gstreamer'>build experimental feature 'conversation' with gstreamer backend</flag> 34 <flag name='gstreamer'>build experimental feature 'conversation' with gstreamer backend</flag>
35 <flag name='qr'>experimental feature</flag> 35 <flag name='qr'>experimental feature</flag>
36 <flag name='tex'>experimental feature</flag> 36 <flag name='tex'>experimental feature</flag>
37 37 <flag name='hardened'>hardened toolchain</flag>
38 </use> 38 </use>
39</pkgmetadata> 39</pkgmetadata>