Adding small trick to avoid autodetect of installed gtk and making gtk dependency optional

Package-Manager: portage-2.0.52-r1

4 files changed, 125 insertions, 2 deletions

diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog
index 99b0a976ba56..412dfa0c9133 100644
--- a/net-p2p/gnunet/ChangeLog
+++ b/net-p2p/gnunet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/gnunet
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.40 2005/09/27 13:16:08 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.41 2005/09/28 09:47:49 mkay Exp $
+
+*gnunet-0.7.0-r2 (28 Sep 2005)
+
+  28 Sep 2005; <mkay@gentoo.org> +gnunet-0.7.0-r2.ebuild:
+  Adding small trick to avoid autodetect of installed gtk and making gtk
+  dependency optional
 
 *gnunet-0.7.0-r1 (27 Sep 2005)
 
diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index 48544998852a..4730d5bd84de 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,10 +1,11 @@
-MD5 6864c1a0701b39157c5f2a46c0dbf8f5 ChangeLog 6462
+MD5 0078c108963613cec3e5eac9cc2935f8 ChangeLog 6648
 MD5 bfa2fa1c39467cbb467197f62ce707ce gnunet-0.7.0-r1.ebuild 2730
 MD5 3d78de0ed5d6b9f64a9f638fe2b94e66 gnunet-0.6.2b.ebuild 1611
 MD5 3f1cee68cfeffdb201bb272c3cce4d58 gnunet-0.6.6b-r1.ebuild 2498
 MD5 54bf4182ef80c96144126d4872202b60 gnunet-0.6.6b.ebuild 2391
 MD5 e5786c00cf6fbfa84ea9e4e00b36db2f gnunet-0.7.0.ebuild 2328
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 cc21648d1cb49c8f914496bbfa273f8f gnunet-0.7.0-r2.ebuild 3002
 MD5 603beec85d7bde0052ceaeb0e5aae7e8 files/digest-gnunet-0.7.0-r1 66
 MD5 d4a748c8e3536c6691b63794f7c17639 files/digest-gnunet-0.6.2b 66
 MD5 3f90482aa89d1669318f7ec7de1943a3 files/digest-gnunet-0.6.6b 67
@@ -15,3 +16,4 @@ MD5 6ac0938893978d5f2bc22bf808bc0fe3 files/gnunet-0.6.6b 794
 MD5 a38f2ed0178c5ebc09e4f5fc2c3baddd files/gnunet-0.6.6b-autotools.patch 2065
 MD5 7e0bb86547b0ad5e7744374d32c124f8 files/gnunet-download-manager.scm 13338
 MD5 53aa63a0ddf902a57c6ac427560b9664 files/gnunet-ipv6-gentoo.patch 1891
+MD5 603beec85d7bde0052ceaeb0e5aae7e8 files/digest-gnunet-0.7.0-r2 66
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0-r2 b/net-p2p/gnunet/files/digest-gnunet-0.7.0-r2
new file mode 100644
index 000000000000..34ba0b44950e
--- /dev/null
+++ b/net-p2p/gnunet/files/digest-gnunet-0.7.0-r2
@@ -0,0 +1 @@
+MD5 182598e8769210e32d865a62743b534e GNUnet-0.7.0.tar.bz2 1302295
diff --git a/net-p2p/gnunet/gnunet-0.7.0-r2.ebuild b/net-p2p/gnunet/gnunet-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..0e9d416eecb4
--- /dev/null
+++ b/net-p2p/gnunet/gnunet-0.7.0-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0-r2.ebuild,v 1.1 2005/09/28 09:47:49 mkay Exp $
+
+inherit eutils 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 mysql sqlite guile nls gtk"
+KEYWORDS="~x86 ~ppc ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=dev-libs/libgcrypt-1.2.0
+	>=media-libs/libextractor-0.5.4
+	>=dev-libs/gmp-4.0.0
+	sys-libs/zlib
+	gtk? ( >=x11-libs/gtk+-2.6.10 )
+	sys-apps/sed
+	ncurses? ( sys-libs/ncurses )
+	mysql? ( >=dev-db/mysql-4.0.24 )
+	sqlite? ( >=dev-db/sqlite-3.0.8 )
+	guile? ( >=dev-util/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}
+
+	# 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
+		autoconf || die "autoconf failed"
+		libtoolize --copy --force
+	fi
+}
+
+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}/gnunet-0.7.0 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 use as a global server config file"
+	einfo
+}
+