public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/, net-p2p/gnunet/
@ 2012-03-08  0:52 Anthony G. Basile
  0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2012-03-08  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0e159f0e92684b8839464069dde44cfad955d680
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 00:39:45 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 00:51:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=0e159f0e

net-p2p/gnunet: working on parallel build issue

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-firewall/ipsec-tools/Manifest                  |    2 +-
 .../ipsec-tools/ipsec-tools-0.8.0-r3.ebuild        |   35 +++----
 net-p2p/gnunet/Manifest                            |   19 +++-
 net-p2p/gnunet/gnunet-0.9.2-r1.ebuild              |  104 ++++++++++++++++++++
 net-p2p/gnunet/metadata.xml                        |    5 +-
 5 files changed, 140 insertions(+), 25 deletions(-)

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 6dcbef0..0e0d9d2 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -8,5 +8,5 @@ AUX racoon.conf.d 605 RMD160 1c2db39154d8470ecd2e0fe95075ec47ffa47613 SHA1 19171
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 AUX racoon.pam.d 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
 DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5bf966 SHA1 d44a955a00cdfcd771fb1eca8267421bd47bc46e SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717
-EBUILD ipsec-tools-0.8.0-r3.ebuild 6426 RMD160 82bf08c4c7456eb475f5a7b0979fcd454be427ba SHA1 568961d2306225c093e92e9ad1c148aef22d2c00 SHA256 6281bf1a192c35ecc03c092ea72b9dfb6bd311d3772e17305003a8648b3c958f
+EBUILD ipsec-tools-0.8.0-r3.ebuild 6351 RMD160 257da56672d4ef74f07d076498312ef54128b325 SHA1 072eab5b17c831e76f6a6d4befa83d9250cf77b3 SHA256 f7ce01ac9c494592785e9c9cfdacb040f14236b464b0887a207ec82b818a139d
 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
index 1a40515..a8e37f8 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
@@ -13,20 +13,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="rc5 idea kerberos stats ipv6 nat selinux readline pam hybrid ldap"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
 
 RDEPEND="
+	dev-libs/openssl
 	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	readline? ( sys-libs/readline )
 	selinux? (
 		sys-libs/libselinux
 		sec-policy/selinux-ipsec-tools
-	)
-	readline? ( sys-libs/readline )
-	pam? ( sys-libs/pam )
-	ldap? ( net-nds/openldap )
-	dev-libs/openssl
-	virtual/libiconv"
-#	iconv? ( virtual/libiconv )
+	)"
 #	radius? ( net-dialup/gnuradius )
 
 DEPEND="${RDEPEND}
@@ -159,22 +157,24 @@ src_configure() {
 	# fix for bug #61025
 	filter-flags -march=c3
 
+	#--with-iconv leads to "Broken getaddrinfo()"
 	local myconf
 	myconf="--with-kernel-headers=/usr/include \
 			--enable-adminport \
-			--enable-frag \
-			--enable-dpd \
 			--enable-dependency-tracking \
-			$(use_enable rc5) \
+			--enable-dpd \
+			--enable-frag \
+			--without-libiconv \
 			$(use_enable idea) \
-			$(use_enable kerberos gssapi) \
-			$(use_enable stats) \
 			$(use_enable ipv6) \
+			$(use_enable kerberos gssapi) \
+			$(use_with ldap libldap) \
 			$(use_enable nat natt) \
-			$(use_enable selinux security-context) \
-			$(use_with readline) \
 			$(use_with pam libpam) \
-			$(use_with ldap libldap)"
+			$(use_enable rc5) \
+			$(use_with readline) \
+			$(use_enable selinux security-context) \
+			$(use_enable stats)"
 
 	use nat && myconf="${myconf} --enable-natt-versions=yes"
 
@@ -185,9 +185,6 @@ src_configure() {
 		myconf="${myconf} $(use_enable hybrid)"
 	fi
 
-	# dev-libs/libiconv is hard masked
-	#use iconv && myconf="${myconf} $(use_with iconv libiconv)"
-
 	# the default (/usr/include/openssl/) is OK for Gentoo, leave it
 	# myconf="${myconf} $(use_with ssl openssl )"
 

diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index c193704..7774617 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,4 +1,17 @@
-AUX gnunet.initd 643 RMD160 434eb6752143fbb600f96a58ed7c5ba1a47e654d SHA1 de7f208ce286a05310551a35345b2f02f5712831 SHA256 c6748f137d7c808685a741617e1449024bcb37dcfc11e883d859f5e0134744a6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gnunet-0.9.2.conf 156 RMD160 379a5c770b972132f66f9fabef75a2dee096599d SHA1 82ec8c694453dd6efca7a5e792b44b9d10d0d35c SHA256 ecede19aea0c4966939048db91dd639d8e01c0235e30520cb77cff18c4d5b1b4
+AUX gnunet-0.9.2.confd 184 RMD160 36cb26316819df6916f9a28107b145c2c1907638 SHA1 02c8c7484b22002b217ed1d769534fc2c6716e6b SHA256 9ac49d2a3d7ccd00f63afcd096a9facf7283d105524f6b1f359656b769db68e3
+AUX gnunet-0.9.2.initd 936 RMD160 36e9c6dd2b8589907d9f8cc0c4ec6663753d2e24 SHA1 06c0e8e4492f9d5df2e061499f33856f2eac72a5 SHA256 74c075059cf4b6fdd3bb88cb420c3ee5a88d4c76151fa0240ec064e89d0b88a4
 DIST gnunet-0.9.2.tar.gz 6239795 RMD160 6b1da8dcfc9edf51954b2d7b627e712a10ecde7a SHA1 f6a85e2af64e743a33a743be4445e67025db4d72 SHA256 24f5f1cb93782c22bd61ffdc9d99b7cfb2532dc4b6fb7d3468931e5a10eb47e9
-EBUILD gnunet-0.9.2.ebuild 2505 RMD160 47943072d7ebcdd7c822638ddfe0aa0b2586d2da SHA1 5b7a8d2ce97c3343bc83497503d5a2675fc77731 SHA256 fa1fd72bd82d47adac7a960aacb71f89ba4e904e1b9b35c8abdd76afc5292a0e
-MISC metadata.xml 451 RMD160 d905b5dd5d7bead232a718516ad06811832e670d SHA1 5a6954f3e22d46f6b0d3c504473d8350a2a27c36 SHA256 09eb158e2fd2a05896fc8da3765428557812ba7afb4abf046e0284505ae1fb56
+EBUILD gnunet-0.9.2-r1.ebuild 2713 RMD160 1c9b2dd777118c0ee09df10098e90a8c400c2feb SHA1 796766f5db0f839c184d2e3acc37264c712fead5 SHA256 c6fffd8530ca44a780a4c9b5bf0c51ac4530bbe4f69e445cb600225846bdd931
+EBUILD gnunet-0.9.2.ebuild 2772 RMD160 60417d8e73d934b68424bb89760ca3936d4d6e0c SHA1 903480edf1e2c88f99df97aa2efdbf5a0d4095fc SHA256 ba1690793ce0d58e6c5e14854830e45838240be238b28a76411c21944b661843
+MISC metadata.xml 508 RMD160 14beb2b3c11f9e9960bb945ad744852cb2894e9f SHA1 9d36338f4bded5dae7aee273c527f2ee94ea2953 SHA256 2d1cbaed2568dca9caebc6968134105dff8afa5cd3b110c4483f778104b804e3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk9X/9EACgkQl5yvQNBFVTWI8QCfYMQCliAKmTUzVhjBcnNqyqwC
+3xsAniaVf8Rq3k2QjupIxIaYJr9ZuMd+
+=fNlr
+-----END PGP SIGNATURE-----

diff --git a/net-p2p/gnunet/gnunet-0.9.2-r1.ebuild b/net-p2p/gnunet/gnunet-0.9.2-r1.ebuild
new file mode 100644
index 0000000..51e356a
--- /dev/null
+++ b/net-p2p/gnunet/gnunet-0.9.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2012 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.ebuild,v 1.2 2010/06/20 13:56:46 xarthisius Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic autotools
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="GNUnet is a framework for secure peer-to-peer networking."
+HOMEPAGE="http://gnunet.org/"
+SRC_URI="ftp://ftp.gnu.org/gnu/gnunet/${MY_P}.tar.gz"
+RESTRICT="test"
+
+IUSE="experimental http mysql nls postgres +sqlite X"
+REQUIRED_USE="
+	!mysql? ( !postgres? ( sqlite ) )
+	!mysql? ( !sqlite? ( postgres ) )
+	!postgres? ( !mysql? ( sqlite ) )
+	!postgres? ( !sqlite? ( mysql ) )
+	!sqlite? ( !postgres? ( mysql ) )
+	!sqlite? ( !mysql? ( postgres ) )
+"
+KEYWORDS="~amd64 ~x86 ~arm"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	>=net-misc/curl-7.21.0
+	>=media-libs/libextractor-0.6.1
+	>=dev-libs/libgcrypt-1.2
+	>=dev-libs/libunistring-0.9.2
+	sys-libs/ncurses
+	sys-apps/sed
+	sys-libs/zlib
+	http? ( >=net-libs/libmicrohttpd-0.9.18 )
+	mysql? ( >=virtual/mysql-5.1 )
+	nls? ( sys-devel/gettext )
+	postgres? ( >=dev-db/postgresql-server-8.3 )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	X? (
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXrandr
+	)
+"
+
+pkg_setup() {
+	enewgroup gnunetdns
+	enewgroup gnunet
+	enewuser gnunet -1 -1 /dev/null gnunet
+}
+
+src_prepare() {
+	sed -i -e 's|$(bindir)/gnunet|$(DESTDIR)$(bindir)/gnunet|g' \
+		"${S}"/src/nat/Makefile.in || die "sed failed"
+	sed -i -e 's|$(bindir)/gnunet|$(DESTDIR)$(bindir)/gnunet|g' \
+		"${S}"/src/transport/Makefile.in || die "sed failed"
+	sed -i -e 's|$(bindir)/gnunet|$(DESTDIR)$(bindir)/gnunet|g' \
+		"${S}"/src/vpn/Makefile.in || die "sed failed"
+	sed -i -e 's|$(bindir)/gnunet|$(DESTDIR)$(bindir)/gnunet|g' \
+		"${S}"/src/dns/Makefile.in || die "sed failed"
+	sed -i -e 's|$(bindir)/gnunet|$(DESTDIR)$(bindir)/gnunet|g' \
+		"${S}"/src/exit/Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	append-ldflags $(no-as-needed)
+
+	econf \
+		$(use_enable experimental) \
+		$(use_with http microhttpd) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_with postgres) \
+		$(use_with sqlite) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	dodoc ABOUT-NLS AUTHORS INSTALL NEWS README
+	insinto /etc
+	newins "${FILESDIR}"/${P}.conf gnunet.conf
+	newconfd "${FILESDIR}"/${P}.confd gnunet
+	newinitd "${FILESDIR}"/${P}.initd gnunet
+	keepdir /var/{lib,log}/gnunet
+	fowners gnunet:gnunet /var/lib/gnunet /var/log/gnunet
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To configure"
+	einfo "	 1) Add user(s) to the gnunet group"
+	einfo "	 2) Edit the server config file '/etc/gnunet.conf'"
+	einfo
+}

diff --git a/net-p2p/gnunet/metadata.xml b/net-p2p/gnunet/metadata.xml
index 237d111..f629753 100644
--- a/net-p2p/gnunet/metadata.xml
+++ b/net-p2p/gnunet/metadata.xml
@@ -4,7 +4,8 @@
 	<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="microhttpd">enable embedded http server support</flag>
-		<flag name="setup">enable setup wizard</flag>
+		<flag name="http">enable embedded http server support</flag>
+		<flag name="experimental">enable experimental options</flag>
+		<flag name="esmtp">enable smtp support</flag>
   </use>
 </pkgmetadata>



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-03-08  0:52 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-08  0:52 [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/, net-p2p/gnunet/ Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox