Add several new use flags. Don't die when neither

mysql nor sqlite are selected, instead fallback to
sqlite.

Resolves: #207302, #205510

(Portage version: 2.1.9.25/cvs/Linux x86_64)

3 files changed, 154 insertions, 3 deletions

diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog
index 954f9a38b6c7..7b05636c5f66 100644
--- a/net-p2p/gnunet/ChangeLog
+++ b/net-p2p/gnunet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/gnunet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.68 2010/06/20 13:56:46 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.69 2011/01/14 00:52:11 sochotnicky Exp $
+
+*gnunet-0.8.1-r1 (14 Jan 2011)
+
+  14 Jan 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  +gnunet-0.8.1-r1.ebuild, metadata.xml:
+  Add several new use flags. Don't die when neither
+  mysql nor sqlite are selected, instead fallback to
+  sqlite.
 
   20 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
   +files/0.8.1-asneeded.patch, gnunet-0.8.1.ebuild,
diff --git a/net-p2p/gnunet/gnunet-0.8.1-r1.ebuild b/net-p2p/gnunet/gnunet-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..dbe0c707c732
--- /dev/null
+++ b/net-p2p/gnunet/gnunet-0.8.1-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.8.1-r1.ebuild,v 1.1 2011/01/14 00:52:11 sochotnicky Exp $
+
+EAPI=2
+
+inherit autotools eutils
+
+S="${WORKDIR}/GNUnet-${PV}"
+DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
+HOMEPAGE="http://gnunet.org/"
+SRC_URI="http://gnunet.org/download/GNUnet-${PV}.tar.gz"
+#tests don't work
+RESTRICT="test"
+
+IUSE="nls +sqlite mysql c-ares adns +setup dialog gtk qt esmtp microhttpd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=dev-libs/libgcrypt-1.2.0
+	>=media-libs/libextractor-0.5.18a
+	>=dev-libs/gmp-4.0.0
+	net-misc/curl
+	sys-libs/zlib
+	sys-apps/sed
+	sqlite? ( >=dev-db/sqlite-3.0.8 )
+	mysql? ( >=virtual/mysql-4.0 )
+	!sqlite? ( !mysql? ( >=dev-db/sqlite-3.0.8 ) )
+	setup? ( >=dev-scheme/guile-1.8.0
+	  dialog? ( dev-util/dialog )
+	  gtk? ( >=x11-libs/gtk+-2.6.10
+			 gnome-base/libglade )
+	  qt? ( x11-libs/qt-gui )
+	)
+	adns? ( net-libs/adns )
+	c-ares? ( net-dns/c-ares )
+	esmtp? ( net-libs/libesmtp )
+	!ppc? ( !ppc64? ( !sparc? ( microhttpd? ( net-libs/libmicrohttpd ) ) ) )
+	nls? ( sys-devel/gettext )"
+
+RDEPEND="${DEPEND}"
+
+pkg_preinst() {
+	enewgroup gnunetd
+	enewuser gnunetd -1 -1 /dev/null gnunetd
+}
+
+src_prepare() {
+	if ! use setup && ( use dialog || use gtk || use qt ); then
+		ewarn
+		ewarn "You chose NOT to install setup utility. Ignoring setup frontends (dialog, gtk, qt)."
+		ewarn
+	fi
+
+	if ! use sqlite; then
+		# make mysql default sqstore if we do not compile sqlite support
+		# (bug #107330)
+		if use mysql; then \
+			sed -i 's:default "sqstore_sqlite":default "sqstore_mysql":' \
+			contrib/config-daemon.in
+		else
+			ewarn
+			ewarn "You didn't specify preferred database (mysql or sqlite)"
+			ewarn "Choosing sqlite for you."
+			ewarn
+		fi
+	fi
+
+	# 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
+
+	epatch "${FILESDIR}"/${PV}-asneeded.patch
+	epatch "${FILESDIR}"/${PV}-parallel-build.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# if neither sqlite nor mysql are chosen pick sqlite
+	if ! use sqlite; then
+		if use mysql; then
+			myconf="${myconf} --without-sqlite"
+		else
+			# fallback to sqlite
+			myconf="${myconf} --with-sqlite"
+		fi
+	fi
+
+	# doesn't work for --with-qt so use_with is unusable
+	use qt || myconf="${myconf} --without-qt"
+
+	econf \
+		$(use_enable nls) \
+		$(use_with mysql) \
+		$(use_with gtk x) \
+		$(use_with dialog) \
+		$(use_with adns) \
+		$(use_with c-ares) \
+		$(use_with esmtp) \
+		$(use_with microhttpd) \
+		$(use_with setup guile) \
+		${myconf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS PLATFORMS README UPDATING || die
+	insinto /etc
+	newins contrib/gnunet.conf gnunet.conf
+	docinto contrib
+	dodoc contrib/* || die
+	newinitd "${FILESDIR}"/${PN}.initd gnunet
+	dodir /var/lib/gnunet
+	chown gnunetd:gnunetd "${D}"/var/lib/gnunet
+}
+
+pkg_postinst() {
+	# make sure permissions are ok
+	chown -R gnunetd:gnunetd "${ROOT}"/var/lib/gnunet
+
+	einfo
+	einfo "To configure"
+	einfo "	 1) Add user(s) to the gnunetd group"
+	einfo "	 2) Run 'gnunet-setup' to generate your client config file"
+	einfo "	 3) Run gnunet-setup -d as root to generate a server config file"
+	einfo
+}
diff --git a/net-p2p/gnunet/metadata.xml b/net-p2p/gnunet/metadata.xml
index aa0f3664825f..0072b675e988 100644
--- a/net-p2p/gnunet/metadata.xml
+++ b/net-p2p/gnunet/metadata.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
+  <herd>net-p2p</herd>
+  <longdescription>GNUnet is a framework for secure peer-to-peer networking that does not use any centralized or otherwise trusted services</longdescription>
+  <use>
+    <flag name="c-ares">enable asynchronous dns support through c-ares library</flag>
+    <flag name="esmtp">enable SMTP support</flag>
+    <flag name="microhttpd">enable embedded http server support</flag>
+    <flag name="setup">enable setup wizard</flag>
+    <flag name="dialog">enable ncurses dialog setup wizard</flag>
+    <flag name="gtk">enable gtk setup wizard</flag>
+    <flag name="qt">enable qt setup wizard</flag>
+    <flag name="sqlite">enable sqlite database backend</flag>
+    <flag name="mysql">enable mysql database backend</flag>
+  </use>
 </pkgmetadata>