Version bump. Change HOMEPAGE and SRC_URI to new upstream. Use new configure patch, applied in upstream git.

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

4 files changed, 135 insertions, 7 deletions

diff --git a/net-irc/bip/ChangeLog b/net-irc/bip/ChangeLog
index 4bf8f2cf3b5f..70c1542ed802 100644
--- a/net-irc/bip/ChangeLog
+++ b/net-irc/bip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/bip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/ChangeLog,v 1.19 2010/09/11 13:33:19 a3li Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/ChangeLog,v 1.20 2011/09/17 16:10:09 a3li Exp $
+
+*bip-0.8.8 (17 Sep 2011)
+
+  17 Sep 2011; Alex Legler <a3li@gentoo.org> +bip-0.8.8.ebuild,
+  +files/bip-0.8.8-configure.patch:
+  Version bump. Change HOMEPAGE and SRC_URI to new upstream. Use new configure
+  patch, applied in upstream git.
 
   11 Sep 2010; Alex Legler <a3li@gentoo.org> -bip-0.8.4.ebuild,
   -bip-0.8.5.ebuild:
diff --git a/net-irc/bip/Manifest b/net-irc/bip/Manifest
index d76b199f07b5..1cdd8a4d8af7 100644
--- a/net-irc/bip/Manifest
+++ b/net-irc/bip/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bip-0.8.8-configure.patch 1465 RMD160 792099c49f351aab2970630d273bb89b08d7358a SHA1 56339f86de394bf8f36d0e5181d30d599ca4c494 SHA256 286e169745e6cd768f0cb95bbc9589ca2bda497eb06461174549b80a459d901c
 AUX bip-CVE-2010-3071.patch 1388 RMD160 4c9a853437c91503b90ad83663f17b58fa058fcf SHA1 8f4333ce21dd9b6491f529c2eb0d15c09076065d SHA256 587b889a16e13fd93dfeb6f66e10bcecb843071ebbbef1dc6b727e2c202f41e9
 AUX bip-configure.patch 813 RMD160 d09c941021ab093f37bb4fc7bc9b2ab65361cf13 SHA1 5d2212cba40696d739ae3efdb0337f2d91eb54f6 SHA256 e713c197fedc1abf6424528b51ffb5afe6acb69dd8f1d93bb7b2770ab4306d99
 AUX bip-freenode.patch 671 RMD160 8a418013b4443e3ea916399346d216984bcb17b1 SHA1 bce7080721511c50f361b2cb4f4a2d39b32b5a23 SHA256 a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f
 AUX bip.vim 157 RMD160 b6b18f156f31ea515e271e7cec714d994c056a41 SHA1 7d0b4e3ddaf6dc5dae04ba1c853075f3ad3232fc SHA256 7c97eaef6d3b51d0e2f9572c919e25a5fc2f480a95469194b012fc507da55fc5
 DIST bip-0.8.5.tar.gz 219985 RMD160 2e0d610f5b8883bd7f453524676ebe95a1a9ea4c SHA1 c8dc9cde94d0ff6b12d6ad2c5c316a58a70f98a5 SHA256 06adbfde12ee7c93b55793d340f6eec60f70dfddbf091ba6664f0b2af593be12
+DIST bip-0.8.8.tar.gz 220232 RMD160 8b6bee0d1d9805de20dfc6a4f096e6ffc890ec3c SHA1 4ec683fd8a71d298e85980b624a334fbae63aed9 SHA256 7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7
 EBUILD bip-0.8.5-r1.ebuild 1780 RMD160 4a91c4344a4fb528a67e8ede78335c607bb063b3 SHA1 d3b12cff5b7acb1a3a78538110e6c2098686cf1a SHA256 721057bc8fed2be862ddae610af804aa5f19e3ad164173389ef30aca97b791fe
-MISC ChangeLog 3200 RMD160 8bbe5a6883e2e2ec90bb3326fa6db45f9928f145 SHA1 16f622092e77325d8f7cf208dce0f9616f1b0870 SHA256 f29e7544d2fef131ae13d31cb1d231179c605e701af0a87dab7b90197f4da834
+EBUILD bip-0.8.8.ebuild 1723 RMD160 2067cf0d03d50f246c7be0b3e43391f7d2dab1ff SHA1 860c8c86c6d4e2deec58a040e575cc18f7ca5d26 SHA256 a818b23cd6ad6be4169ca58d9abaf10915e3229a9edf8f9f7c5fc1393e576326
+MISC ChangeLog 3440 RMD160 40cd8a79acbda72175284ec0be106d1ae81e4ce9 SHA1 5fa02cd6cb78d04d8d0db3a7ca83f20d6870f8d4 SHA256 757900597f9cfb762d14f2b496b58faf4a13b5a016184f06020459ce24cc787b
 MISC metadata.xml 1102 RMD160 7cd449daed13af6f3f4165e99361542eb51b4820 SHA1 95d8b6681d216d97a3348b2799bbeb560a195325 SHA256 e5303154ae5787821fb38ca9be06d1e7cf033cc04a7098b07581c2e8ead8bbf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAkyLhScACgkQ3Ca6Xy8+rvST0AD/TnNAHl07Zj3gd70gnsTRIrLf
-o5i43ojVuCLGH3kYy9sA/jW2C+6pv5Bhi1w5grI8PJVM5z48Qm2Kjo6mGovJze3e
-=Grwb
+iF4EAREIAAYFAk50xmsACgkQ3Ca6Xy8+rvRFbwD8DCwTtZPnRXrv/aBfOc3iMxJR
+i9bGfeEuY7aT/aWK2oAA/jTVpJC4oRw00JosNr9HNzBvrwWZjie9CNeZHvN+6uDV
+=WT0b
 -----END PGP SIGNATURE-----
diff --git a/net-irc/bip/bip-0.8.8.ebuild b/net-irc/bip/bip-0.8.8.ebuild
new file mode 100644
index 000000000000..67117e3f2585
--- /dev/null
+++ b/net-irc/bip/bip-0.8.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/bip-0.8.8.ebuild,v 1.1 2011/09/17 16:10:09 a3li Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+DESCRIPTION="Multiuser IRC proxy with SSL support"
+HOMEPAGE="http://bip.milkypond.org/"
+SRC_URI="ftp://ftp.duckcorp.org/bip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug freenode noctcp ssl vim-syntax oidentd"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	vim-syntax? ( || ( app-editors/vim
+	app-editors/gvim ) )
+	oidentd? ( >=net-misc/oidentd-2.0 )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-configure.patch" || die
+
+	eautoreconf
+
+	if use noctcp; then
+		sed -i -e '/irc_privmsg_check_ctcp(server, line);/s:^://:' src/irc.c || die
+	fi
+
+	if use freenode; then
+		epatch "${FILESDIR}/${PN}-freenode.patch" || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_enable debug) \
+		$(use_enable oidentd)
+}
+
+src_compile() {
+	# Parallel make fails.
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dobin src/bip src/bipmkpw || die "dobin failed"
+
+	dodoc AUTHORS ChangeLog README NEWS TODO || die "dodoc failed"
+	newdoc samples/bip.conf bip.conf.sample || die "newdoc failed"
+	doman bip.1 bip.conf.5 bipmkpw.1 || die "doman failed"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins samples/bip.vim || die "doins failed"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/bip.vim || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	elog 'The default configuration file is "~/.bip/bip.conf"'
+	elog "You can find a sample configuration file in"
+	elog "/usr/share/doc/${PF}/bip.conf.sample"
+}
diff --git a/net-irc/bip/files/bip-0.8.8-configure.patch b/net-irc/bip/files/bip-0.8.8-configure.patch
new file mode 100644
index 000000000000..592bdc664561
--- /dev/null
+++ b/net-irc/bip/files/bip-0.8.8-configure.patch
@@ -0,0 +1,50 @@
+commit 559fa7ed44238e811ac0c11321ed021c35cba2be
+Author: Pierre-Louis Bonicoli <pierre-louis.bonicoli@gmx.fr>
+Date:   Wed Sep 14 06:30:09 2011 +0200
+
+    don't override user var. Thanks to Alex Legler
+    
+    Based on gentoo-x86/net-irc/bip/files/bip-configure.patch
+    See http://www.gnu.org/software/autoconf/manual/automake.html#User-Variables
+    If user doesn't specify CFLAGS, default value is "-Wall -Wextra -g -O2".
+
+diff --git a/Makefile.am b/Makefile.am
+index c2dae4d..f17c314 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,13 +13,8 @@ src_bip_SOURCES = src/conf.y src/lex.l \
+ src_bipmkpw_SOURCES = src/bipmkpw.c src/md5.c src/util.c
+ AM_YFLAGS= -d
+ BUILT_SOURCES = src/conf.c src/conf.h src/lex.c
+-if DEBUG
+-	AM_CFLAGS+=-Wall -g
+-	AM_LDFLAGS+=-g
+-else
+-	AM_CFLAGS+=-Wall
+-endif
+ 
++AM_CFLAGS=-Wall -Wextra
+ 
+ dist_man_MANS = bip.1 bip.conf.5 bipmkpw.1
+ 
+diff --git a/configure.ac b/configure.ac
+index 005e697..5740a39 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,16 +44,12 @@ AC_ARG_ENABLE([pie], AS_HELP_STRING([--disable-pie], [Do not build a position in
+ 
+ AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes)
+ AS_IF([test "x$enable_debug" = "xyes"], [
+-	CFLAGS="-O0 -g -W -Wall"
+-	LDFLAGS="-g"
+ 	AC_CHECK_FUNC(backtrace_symbols_fd, [
+ 		AC_DEFINE(HAVE_BACKTRACE, [], [Use glibc backtrace on fatal()])
+ 		LDFLAGS="-rdynamic $LDFLAGS"
+ 		backtrace="(with backtrace)"
+ 	])
+ ], [
+-	CFLAGS="-O2 -g -W -Wall"
+-	LDFLAGS="-g"
+ 	enable_debug=no
+ ])
+