Changing default sql-module from sqlite into mysql if compiled without sqlite support...

Package-Manager: portage-2.0.52-r1

diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog
index ca4138ae55f40dda1c018e21b12e039d52387331..99b0a976ba568a262056baea0b8119441daa69d9 100644 (file)
--- a/net-p2p/gnunet/ChangeLog
+++ b/net-p2p/gnunet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2005/09/26 23:06:00 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.40 2005/09/27 13:16:08 mkay Exp $
+
+*gnunet-0.7.0-r1 (27 Sep 2005)
+
+  27 Sep 2005; <mkay@gentoo.org> +gnunet-0.7.0-r1.ebuild:
+  Changing default sql-module from sqlite into mysql if compiled without
+  sqlite support. Ebuild now also need at least one of sqlite or mysql USE
+  flags
 
   26 Sep 2005; <mkay@gentoo.org> gnunet-0.7.0.ebuild:
   mysql support was built even with USE=-mysql if mysql was installed in

diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index d66b331cc6287dfb034bfd068ae3b576e9461a39..48544998852adf933de13383b1e67ee3196dc0cd 100644 (file)
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,9 +1,11 @@
-MD5 57604d1fee76dd2b34c9ef7cd7b05a46 ChangeLog 6215
+MD5 6864c1a0701b39157c5f2a46c0dbf8f5 ChangeLog 6462
+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 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
 MD5 3f90482aa89d1669318f7ec7de1943a3 files/digest-gnunet-0.6.6b-r1 67

diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0-r1 b/net-p2p/gnunet/files/digest-gnunet-0.7.0-r1
new file mode 100644 (file)
index 0000000..34ba0b4
--- /dev/null
+++ b/net-p2p/gnunet/files/digest-gnunet-0.7.0-r1
@@ -0,0 +1 @@
+MD5 182598e8769210e32d865a62743b534e GNUnet-0.7.0.tar.bz2 1302295

diff --git a/net-p2p/gnunet/gnunet-0.7.0-r1.ebuild b/net-p2p/gnunet/gnunet-0.7.0-r1.ebuild
new file mode 100644 (file)
index 0000000..48c4516
--- /dev/null
+++ b/net-p2p/gnunet/gnunet-0.7.0-r1.ebuild
@@ -0,0 +1,106 @@
+# 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-r1.ebuild,v 1.1 2005/09/27 13:16:08 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"
+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
+       >=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}
+
+       ! use sqlite && \
+               sed -i 's:default "sqstore_sqlite":default "sqstore_mysql":' \
+               contrib/config-daemon.in
+}
+
+src_compile() {
+#      elibtoolize --copy --force
+
+       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
+}
+