Remove USE="rss" (and export ac_cv_lib_raptor_raptor_init=no) in order to remove old SLOT of media-libs/raptor wrt #409417

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

4 files changed, 41 insertions, 42 deletions

diff --git a/net-irc/eiwic/ChangeLog b/net-irc/eiwic/ChangeLog
index bbeb7e22b69b..8b61a8f54dca 100644
--- a/net-irc/eiwic/ChangeLog
+++ b/net-irc/eiwic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/eiwic
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eiwic/ChangeLog,v 1.9 2011/05/28 07:59:47 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eiwic/ChangeLog,v 1.10 2012/04/06 18:58:42 ssuominen Exp $
+
+  06 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  files/eiwic-1.1.3-ldflags.patch, eiwic-1.1.4.ebuild:
+  Remove USE="rss" (and export ac_cv_lib_raptor_raptor_init=no) in order to
+  remove old SLOT of media-libs/raptor wrt #409417
 
   28 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> eiwic-1.1.4.ebuild:
   x86 stable wrt bug #366575
diff --git a/net-irc/eiwic/Manifest b/net-irc/eiwic/Manifest
index 46c56df64081..b0129f2efe73 100644
--- a/net-irc/eiwic/Manifest
+++ b/net-irc/eiwic/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX eiwic-1.1.3-ldflags.patch 725 RMD160 94fa64529199a0e0add2e339ae3807a09a5d636a SHA1 33f9d00ca7414ba5969ca01b14370f6a42567e62 SHA256 98f466c08667dfaaedbf1ba04022ca870a4d0f9b0b2dd3c4b6db11df05759730
+AUX eiwic-1.1.3-ldflags.patch 648 RMD160 abd746e5a0d9140ab0b55e095f1e59438e2acc8a SHA1 0361e5f77ca7f44e8ac1d2b051a36a60bca61f7f SHA256 2ed6b18abd4003df0b5fd698f53e7d31d3627ee6fecd6da757e30aee093c2345
 DIST eiwic-1.1.4.tar.gz 117593 RMD160 181c60c8ff9bf707af530a86f07c98be09a328b2 SHA1 985e4f8f9fd78c633d7d9c600be92a395a57a08b SHA256 6a49a859e46548f8ed005ed3c6338c64cc6725a08c32e5bbd075f8eee1eec800
-EBUILD eiwic-1.1.4.ebuild 1276 RMD160 0b5ee0c87fd061160702190e84cf7e05cf810293 SHA1 baf8fe5c10a576349baa7baccce99822f481d4a1 SHA256 24215e2922e182e3f540a4ec90d0ba1ee5bf5652ebb98e103293cf40b5db751d
-MISC ChangeLog 1180 RMD160 155b70f9a5e65e2c675772a870921d30666050c7 SHA1 3c8c738be711584809b2da067e2c7ab4d9cddd1c SHA256 e2dc6513f4bdc6e84a9ca506aa0c0955ba06e729f1a46bf7b8472494264c9930
+EBUILD eiwic-1.1.4.ebuild 1044 RMD160 aea12080a48e2d919fe28a93e743aea4d05f0b82 SHA1 53de6e00c56723d7bd1356e9f4735fa18d9debfe SHA256 b5116db1fcdf16062bf564693dcc02595d7cb30506010286598b5db0eef333ef
+MISC ChangeLog 1417 RMD160 7d130966bdd7fc2aa1b4952197b38f33cf29162f SHA1 b6a6df9b75b11fe54618541b8855f913a86556fb SHA256 561159d68a4fc2e429bf3c0ccfcc3a522c019731ea2029691f698e30823fc854
 MISC metadata.xml 574 RMD160 044092de54ed53bc06541e3b537aa868621c776b SHA1 f19ff62ccf31521a52ed8e9ebc058fdda6f0185b SHA256 5acc504f7f8a5e78eb962ce25d3e7bd5c4bd90c0fdc1fe4b5abb7b15645b8b4a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59qWQACgkQfXuS5UK5QB3p8wP/UM3/AW5WnS6p6fjYe4479C/f
-X0F/eNo/gi+Sk+hEvmgHgGJuvXy0xhSIzsYZywldgWTJZjsI7xT3sSndsQzC9jhe
-PmLn0w5j6qBVIdin9MN47n3+WvRI3gkq+LKH6056r9BttMVLuvu86kxjfWJKlSdy
-FDuKGNwdTPkpoFto4H4=
-=QiDf
+iQEcBAEBAgAGBQJPfzzDAAoJEEdUh39IaPFNuAQH+wRe2GVq07c21Td2QxHjnYO3
+M8A7t1AinfLymWFgnvWsgfLXa9wQd72TmVkCCqpOI7i7CidRAOtXaFowQHmPSol0
+jiPThn5geIIQVW4cAzQZ0v2DK01d7a3b5qEMR/wYTFH0gi9o+HrGFRt1EJKkktiM
+RP35yLZWRfVC4t+NfyknZMlZ68kc6oebLU/dZqP5/I9Fc/994FfyGa5JjY38FNp/
+lDDa+2SF8vV8jHC08znjLfJboZ9thPgr0HAz0SD4exlodp2ptCCC/jR+ORZu49Al
+Jn2pyoQT03C3f4THxz/aSoo03Sbj3+hdPeaOZmnKXlZ7qxu6fqZz6pAzYPy9Nro=
+=aGHT
 -----END PGP SIGNATURE-----
diff --git a/net-irc/eiwic/eiwic-1.1.4.ebuild b/net-irc/eiwic/eiwic-1.1.4.ebuild
index a85a55d6dd78..fb980b8ad340 100644
--- a/net-irc/eiwic/eiwic-1.1.4.ebuild
+++ b/net-irc/eiwic/eiwic-1.1.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eiwic/eiwic-1.1.4.ebuild,v 1.5 2011/05/28 07:59:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eiwic/eiwic-1.1.4.ebuild,v 1.6 2012/04/06 18:58:42 ssuominen Exp $
 
-inherit autotools eutils multilib flag-o-matic
+EAPI=4
+inherit autotools eutils multilib
 
 DESCRIPTION="A modular IRC bot written in C"
 HOMEPAGE="https://github.com/lordi/Eiwic"
@@ -11,44 +12,35 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug doc ipv6 rss"
+IUSE="debug doc ipv6"
 
-DEPEND="rss? ( <media-libs/raptor-1.9.0 )"
-RDEPEND="${DEPEND}"
+DOCS="AUTHORS ChangeLog README NEWS TODO sample.conf"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i "/^set MODULE_PATH/s:modules:/usr/$(get_libdir)/eiwic:" sample.conf
-	sed -i "/^load MODULE/s:$:.so:" sample.conf
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.3-ldflags.patch
+
+	sed -i \
+		-e "/^set MODULE_PATH/s:modules:/usr/$(get_libdir)/eiwic:" \
+		-e "/^load MODULE/s:$:.so:" \
+		sample.conf || die
+
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
+	export ac_cv_lib_raptor_raptor_init=no #409417
+
 	econf \
 		$(use_enable debug vv-debug) \
 		$(use_enable ipv6)
-	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog README NEWS TODO sample.conf
-
-	if use doc; then
-		dohtml doc/*
-	fi
+	default
+	use doc && dohtml doc/*
 }
 
 pkg_postinst() {
-	echo
-	einfo "You need a configuration file to run eiwic"
-	einfo "A sample configuration was installed to"
-	einfo "/usr/share/doc/${PF}/"
-	echo
-	if use debug; then
-		einfo "For debugging options please see eiwic -h"
-		echo
-	fi
+	elog "You need a configuration file to run eiwic. A sample configuration"
+	elog "was installed to /usr/share/doc/${PF}"
 }
diff --git a/net-irc/eiwic/files/eiwic-1.1.3-ldflags.patch b/net-irc/eiwic/files/eiwic-1.1.3-ldflags.patch
index a15ef017fede..2870dc4f322b 100644
--- a/net-irc/eiwic/files/eiwic-1.1.3-ldflags.patch
+++ b/net-irc/eiwic/files/eiwic-1.1.3-ldflags.patch
@@ -1,5 +1,5 @@
---- modules/Makefile.am.orig	2009-02-09 17:47:30.237896861 +0100
-+++ modules/Makefile.am	2009-02-09 17:47:48.382983848 +0100
+--- modules/Makefile.am
++++ modules/Makefile.am
 @@ -15,8 +15,8 @@
  		echo "$@ skipped."; \
  	else :;\