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

(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)

3 files changed, 29 insertions, 32 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/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 :;\