gnunet, gnunet-gtk: 0.10.1_p20160501 (pre portage tests)

1 files changed, 30 insertions, 24 deletions

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 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-#
+
 # taken from https://338909.bugs.gentoo.org/attachment.cgi?id=381924
 # referenced at https://bugs.gentoo.org/show_bug.cgi?id=338909
 # merged with 9999 variant from emery overlay
 # refined 2015-07 by carlo von lynX of youbroketheinternet.org
-# tweaks, complete rewrite since 2015-07 by ng0
+# complete rewrite by ng0 (collective libertad)
 
 EAPI=6
 
 DESCRIPTION="Cryptographic GNU Mesh/Underlay Network Routing Layer"
 HOMEPAGE="https://gnunet.org/"
 LICENSE="GPL-3"
-PYTHON_COMPAT=( python2_7 ) #rest needs to be tested
+PYTHON_COMPAT=( python2_7 ) # tests are not yet python3 compatible.
 
 if [[ "${PV}" == "9999" ]]; then
         inherit eutils autotools subversion user python-any-r1
@@ -29,34 +29,28 @@ else
         WANT_AUTOMAKE="1.11"
         WANT_LIBTOOL="2.2"
         AUTOTOOLS_AUTORECONF=1
-        SRC_URI="mirror://gentoo/${P}.tar.gz
-                        https://libertad.pw/static/${PN}-${PV}.tar.gz"
-        #intended temporary place, also later moved to code.*
-        #old/upstream: mirror://gnu/${PN}/${P}.tar.gz
+        SRC_URI="mirror://gnu/gnunet/${P}.tar.gz"
 fi
+
 AUTOTOOLS_IN_SOURCE_BUILD=1
 KEYWORDS="~amd64"
 SLOT="0"
-IUSE="+httpd +sqlite postgresql mysql nls nss +X +gnutls +dane +bluetooth ssl experimental extra conversation pulseaudio gstreamer qr tex test"
-# With current svn numbers this is no longer needed.
+IUSE="+httpd +sqlite postgresql mysql nls nss +X +gnutls +dane +bluetooth ssl experimental extra conversation pulseaudio gstreamer qr tex test hardened"
+# Current svn numbers no longer need to be patched.
 #if [[ ${PV} != "9999" ]] ; then
 #       PATCHES=( "${FILESDIR}"/install.diff )
 #fi
-RESTRICT="test" # how is running tests handled in this case in gentoo?
+RESTRICT="test"
 REQUIRED_USE="?? ( mysql postgresql sqlite )
                           ?? ( pulseaudio gstreamer )"
 
-# note for gentoo-hardened:
-# might be possible to build with
-# "--with-gcc-hardening" and "--with-linker-hardening"
-
 RDEPEND="
         mysql? ( >=virtual/mysql-5.1 )
         postgresql? ( >=dev-db/postgresql-8.3:= )
         sqlite? ( >=dev-db/sqlite-3.0 )
         >=net-misc/curl-7.21.0
         >=media-libs/libextractor-0.6.1
-        >=dev-libs/libgcrypt-1.7
+        >=dev-libs/libgcrypt-1.6
         >=dev-libs/libunistring-0.9.3
         >=net-misc/gnurl-7.34.0
         gnutls? ( net-libs/gnutls )
@@ -83,7 +77,8 @@ RDEPEND="
                 conversation? (
                                 gstreamer? (
                                            media-libs/gstreamer:1.0
-                                           dev-libs/glib:2 )
+                                           dev-libs/glib:2
+                                )
                                 pulseaudio? ( >=media-sound/pulseaudio-2.0 )
                                 >=media-libs/opus-1.0.1
                                 >=media-libs/libogg-1.3.0
@@ -100,13 +95,12 @@ DEPEND="
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
+        enewgroup gnunetdns
         enewgroup gnunet
         enewuser "gnunet" -1 -1 /var/lib/gnunet "gnunet"
         esethome "gnunet" /var/lib/gnunet
 }
 
-# Technically it is a svn checkout, just to be sure
-# we run what ./bootstrap would do.
 src_prepare() {
         if [[ "${PV}" == "9999" ]]; then
                 subversion_src_prepare
@@ -115,6 +109,7 @@ src_prepare() {
                 ./contrib/pogen.sh || die
                 default
         else
+                # run what ./bootstrap would run:
                 rm -rf libltdl || die
                 eautoreconf
                 ./contrib/pogen.sh || die
@@ -135,13 +130,14 @@ src_configure() {
                 $(use_with gnutls) \
                 $(use_with bluetooth) \
                 --with-libextractor
+        # hardened build (untested)
+        use hardened && append-ldflags "--with-gcc-hardening --with-linker-hardening"
 }
 # debug those:
 #$(use_with ssl) \
 
 src_install() {
         default
-        #newinitd "${FILESDIR}/gnunet.initd" gnunet
         newinitd "${FILESDIR}"/gnunet.initd gnunet
         insinto /etc/gnunet
         doins "${FILESDIR}"/gnunet.conf
@@ -150,8 +146,7 @@ src_install() {
 }
 
 pkg_postinst() {
-        einfo "Updating GTK icon cache"
-        gtk-update-icon-cache #does not work somehow.
+        # We should update the gtk icon cache for the icons.
         elog "To configure"
         elog "   1) Add desired user(s) to the 'gnunet' group"
         elog "   2) Edit the system-wide config file '/etc/gnunet/gnunet.conf'"
@@ -162,7 +157,18 @@ pkg_postinst() {
         elog "      want to run GNUnet another way."
         elog "   4) Certain services will require '/dev/net/tun' to exist,"
         elog "      which you must enable in your kernel."
-        elog ""
-        elog "   For further troubleshooting and info, take a look at the wiki"
-        elog "   page about gnunet."
+        elog " "
+        elog "Optionally, emerge gnunet-gtk to get a GUI for file-sharing and"
+        elog "configuration. This is particularly recommended"
+        elog "if your network setup is non-trivial, as gnunet-setup can be"
+        elog "used to test in the GUI if your network configuration is working."
+        elog "gnunet-setup should be run as the \"gnunet\" user under X.  As it"
+        elog "does very little with the network, running it as \"root\" is likely"
+        elog "also harmless.  You can also run it as a normal user, but then"
+        elog "you have to copy \"~/.gnunet/gnunet.conf\" over to the \"gnunet\" user's"
+        elog "home directory in the end."
+        elog " "
+        elog "Once you have configured your peer, run (as the 'gnunet' user)"
+        elog "\"gnunet-arm -s\" to start the peer. You can then run the various"
+        elog "GNUnet-tools as your \"normal\" user (who should only be in the group 'gnunet')."
 }