Properly check for libevent (maybe bug #418333).

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

4 files changed, 111 insertions, 6 deletions

diff --git a/net-proxy/nylon/ChangeLog b/net-proxy/nylon/ChangeLog
index a8afc97470e9..5526efc89f2c 100644
--- a/net-proxy/nylon/ChangeLog
+++ b/net-proxy/nylon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/nylon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/nylon/ChangeLog,v 1.12 2012/07/20 01:28:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/nylon/ChangeLog,v 1.13 2012/10/09 21:19:48 jer Exp $
+
+*nylon-1.21-r1 (09 Oct 2012)
+
+  09 Oct 2012; Jeroen Roovers <jer@gentoo.org> +nylon-1.21-r1.ebuild,
+  +files/nylon-1.21-libevent.patch:
+  Properly check for libevent (maybe bug #418333).
 
   20 Jul 2012; Anthony G. Basile <blueness@gentoo.org> nylon-1.21.ebuild:
   Keyword ~ppc64
diff --git a/net-proxy/nylon/Manifest b/net-proxy/nylon/Manifest
index ae7b6261fce6..49b0d84ad12a 100644
--- a/net-proxy/nylon/Manifest
+++ b/net-proxy/nylon/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX nylon-1.21-libevent.patch 1854 SHA256 ea71796bf182db5291f98d31c19b2e465584b58dbb350bf124f0e8ad907e59d3 SHA512 0a960cd2ef775b53358f9eabc39a73b43534b82ab84eb0cdc2491d69c9f1aa5a69321a84e91a9d759ab65c152b0f6e0a3e93ca4d16e25f3a637215aaccab5fb0 WHIRLPOOL ea9cdf708a8f9f78cb880ff1acfedf2003c416a8916ac1e26cf734ec5312da2c9e64dbb9b40f77d8b3f41c4efd299f6d1349fd8d6aa04d9d4ca9e92dd0134e16
 AUX nylon.conf 784 SHA256 f76023e332e379fcba3ac1f98385450fb8999726c85803dc8a74f19ce69680e2 SHA512 981798c0efd0f1bfcec6274d787883ff79afe8e5c071637f9d93a849e5fc2b11710c8ecbc9692362803fd586da7809862f5fd906b6908c16b49d4b16e5ab819d WHIRLPOOL 7a89e33b49358209edbe486e27d4de30ce055848fcfa401628ba032c600bd882602bf5d42d9d1f9a599d2576a81d4dd5b959e8b29a57a626e90df05b1971a464
 AUX nylon.init 508 SHA256 2788b00de76390b6feb199b76422d7db4651802177877f9a258a1f3e71dbaea3 SHA512 92566c2ecba0c3a3c1095db4b106a7574a9b8a3e9b3beb2fff79ad628eaf63be84ed8b8e392322d1f4f12bf4832528b303e7136a73da7472b1db34f663aea25f WHIRLPOOL dd09fe5fb748b3edd75ef9e9aa45706ba02a1ffb9f9b028fe3157dd31a4e0090fa8f1d761989dbd4c018b80f6feb9542c0d04122a840c7bb62bb61c5ac1aefe3
-DIST nylon-1.21.tar.gz 115954 RMD160 2d0dfcc1893d6df67dd2afbf815548b9f0b4cca7 SHA1 96f82a785ffe92fd6c1eebb69787327eecc90569 SHA256 34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4
+DIST nylon-1.21.tar.gz 115954 SHA256 34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4 SHA512 7338ebf376843a49777bfc2c04dc0f9b14a25162efb008a555b6d74991bfbddbe5eb8fa6371c8c6a4dae9739f15d6d85135ba9d39472bc2646293a39777b5cfa WHIRLPOOL 50d223998e5f7992dbba17568839d1c6992dc4231d5855a904a93e0e076aea5bc0c57e550fc4f3cd3b72399da16f227342ad061f31e8e0dd626192154a5c8699
+EBUILD nylon-1.21-r1.ebuild 760 SHA256 8464a2e4eabf2030ca689a297edb7063a4c88827f6f6af0b80ce9b1e48527b9a SHA512 a3992d5edbb058c3cf99eb4dce02568d9621b342f68d8356fe354da14bb2cff351cd1413043812bbf1a548a9ff6af6c2f7a2f0b23642d01807b5f8e6e593ffea WHIRLPOOL 883b95d0dbbc466a378f2a69d94b3684091f09bbc1af2c074b9acc2c4a1adb62ee35027542a50b8c9eb59433b8f33e7c75fe271ce3f497b98fddb6c36d257f5d
 EBUILD nylon-1.21.ebuild 636 SHA256 19169daf46ac30c20df5b915ba60483e68d3fc00593169e81d7fe0c0905476e8 SHA512 2e78cf6cd296e643c2556d196c2bd22159b213b0210dbe5310ab7fd520632f8a21fa6b416eb2dce3a0a247da90549959416a90191e007ed08f6c3b63c95dfed8 WHIRLPOOL 6136c9c661711d4ed95fa543b54f74ba46685482f52ec16c817d3964229aee75a7f41027065beef29d6672a9fdc81393279098be94c8c22a0ac96700f3b63c4f
-MISC ChangeLog 2426 SHA256 1f191204ad09631f6d68987a31d4b6fdbe4897ce51101cc588428577ea4e9f33 SHA512 58d78f33c62e50bc58501cf6c2d11944067c401e72324536a117e237cbfb2911e5b6a92db36515bc6f415967180441038131a84c5da940640194e5c7bc417f23 WHIRLPOOL 80b5dac43137b88cb010b12cd9d88f9877e664cdeed016b44abbd4d8c505cfe5d7f813f44a969833b52ce1dd7ec4e22f43082ebd58d87c1773af1c27d8acdf04
+MISC ChangeLog 2609 SHA256 adaf3d33dfb139c1aa090277655fffc89c2e12158a95147909672a9987ce793e SHA512 d42125f9533ca6286b37699d249f6f30762c0f84e9d68182eaeafc934b150d83f19714f0d0e5f1e38731ddb97e4456f03694754ee57136352c8f5b998891c1a8 WHIRLPOOL e5dff19cc787f1b7f951166ed715fd48e4c7585311e76a00755d9f99014513ce9a3817cd3c60c48575e2f7ba3312a9afd5d81726529e099872cc5e6e1ea77268
 MISC metadata.xml 347 SHA256 237ee769a082a6fa362f4d1755c4ba4805f0c3e4a544ca356e247a9103c7ef60 SHA512 0bcb731137e8a6d744ab52acad8ea0eb0153951f560a342c5ec51e3325cf9dd8ec39f5a56937d9480396b6c7280d14208b11a3195eea6e8e51174439845769f3 WHIRLPOOL c5999898ae22770d6da5ab6ed4ec62c6ce736bc007c800b882e4d8da040b37cb40587b790982b3c589158cda1d342aa19f8f2874c39d8483b81be41f73bbca3d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAItF4ACgkQl5yvQNBFVTWAZgCfb3WiH9YtEWZraiM0OUGU9lU5
-LpsAmwaLsOyogp/T7wrPOitpdWcXCvjS
-=fyi0
+iEYEAREIAAYFAlB0lPkACgkQVWmRsqeSphMOOwCeOwPQSPGRrBnSQ1YqJOyZs4Ny
+Q5cAnRtGIqRR3wVKiVsIusKuEc6G4Jlm
+=XcQ3
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/nylon/files/nylon-1.21-libevent.patch b/net-proxy/nylon/files/nylon-1.21-libevent.patch
new file mode 100644
index 000000000000..d7ca2a1ab0e9
--- /dev/null
+++ b/net-proxy/nylon/files/nylon-1.21-libevent.patch
@@ -0,0 +1,63 @@
+--- a/configure.in
++++ b/configure.in
+@@ -95,44 +95,10 @@
+ AC_REPLACE_FUNCS(strlcpy strlcat strsep setproctitle daemon)
+ 
+ dnl Checks for libevent
+-AC_MSG_CHECKING(for libevent)
+-AC_ARG_WITH(libevent,
+-[  --with-libevent=DIR     use libevent in DIR],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        EVENTINC="-I$withval/include"
+-        EVENTLIB="-L$withval/lib -levent"
+-     elif test -f $withval/event.h -a -f $withval/libevent.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        EVENTINC="-I$withval"
+-        EVENTLIB="-L$withval -levent"
+-     else
+-        AC_ERROR(event.h or libevent.a not found in $withval)
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.a;
+-then
+-     EVENTINC="-I${prefix}/include"
+-     EVENTLIB="-L${prefix}/lib -levent"
+-  elif test -f /usr/include/event.h; then
+-     EVENTLIB="-levent"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_ERROR(libevent not found)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+-AC_SUBST(EVENTINC)
+-AC_SUBST(EVENTLIB)
++PKG_CHECK_MODULES(LIBEVENT,libevent,,)
++
++AC_SUBST(LIBEVENT_CFLAGS)
++AC_SUBST(LIBEVENT_LIBS)
+ 
+ if test "x${sysconfdir}" = 'x${prefix}/etc'; then
+     csysconfdir="${prefix}/etc"
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,7 +5,7 @@
+ nylon_SOURCES = nylon.c print.c cfg.c expanda.c net.c access.c atomicio.c \
+                 socks4.c socks5.c mirror.c cleanup.c misc.c
+ 
+-AM_CFLAGS = @EVENTINC@ -Wall -g
+-LDADD = @EVENTLIB@ @LIBOBJS@
++AM_CFLAGS = @LIBEVENT_CFLAGS@
++LDADD = @LIBEVENT_LIBS@ @LIBOBJS@
+ 
+ EXTRA_DIST = strlcpy.c strlcat.c setproctitle.c strsep.c err.c daemon.c
diff --git a/net-proxy/nylon/nylon-1.21-r1.ebuild b/net-proxy/nylon/nylon-1.21-r1.ebuild
new file mode 100644
index 000000000000..eca0a79c95b2
--- /dev/null
+++ b/net-proxy/nylon/nylon-1.21-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/nylon/nylon-1.21-r1.ebuild,v 1.1 2012/10/09 21:19:48 jer Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A lightweight SOCKS proxy server"
+HOMEPAGE="http://monkey.org/~marius/nylon/"
+SRC_URI="http://monkey.org/~marius/nylon/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libevent-0.6"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( README THANKS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libevent.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	insinto /etc ; doins "${FILESDIR}/nylon.conf"
+	newinitd "${FILESDIR}/nylon.init" nylond
+}