Ported to modular X dependencies, bug #153214.

(Portage version: 2.1.2_rc1-r3)

3 files changed, 61 insertions, 41 deletions

diff --git a/net-nntp/knews/ChangeLog b/net-nntp/knews/ChangeLog
index d45503de12fb..0677753342d5 100644
--- a/net-nntp/knews/ChangeLog
+++ b/net-nntp/knews/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nntp/knews
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/knews/ChangeLog,v 1.2 2005/01/17 21:40:00 swegener Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/knews/ChangeLog,v 1.3 2006/11/04 02:07:44 swegener Exp $
+
+  04 Nov 2006; Sven Wegener <swegener@gentoo.org> knews-1.0.1b-r2.ebuild:
+  Ported to modular X dependencies, bug #153214.
 
 *knews-1.0.1b-r2 (17 Jan 2005)
 
diff --git a/net-nntp/knews/files/digest-knews-1.0.1b-r2 b/net-nntp/knews/files/digest-knews-1.0.1b-r2
index 04b31682ea01..9d6a3383e2db 100644
--- a/net-nntp/knews/files/digest-knews-1.0.1b-r2
+++ b/net-nntp/knews/files/digest-knews-1.0.1b-r2
@@ -1,2 +1,6 @@
-MD5 850ebff7772d576314060ebe6ef81b73 knews-1.0b.1.tar.gz 392225
 MD5 19dba49bee12dea7f75060da577f0b81 knews-1.0b.1-gentoo.diff.bz2 3892
+RMD160 a9bd2c2d56d77cb0febbcfacdbcb5d38526d3b39 knews-1.0b.1-gentoo.diff.bz2 3892
+SHA256 bf0cf4bd164b8515afe03e987e5e3dccae8340bf9faf1ae6718948c8cee0f571 knews-1.0b.1-gentoo.diff.bz2 3892
+MD5 850ebff7772d576314060ebe6ef81b73 knews-1.0b.1.tar.gz 392225
+RMD160 c29cd8401bd802852f875d3c531f2f0f8805cc43 knews-1.0b.1.tar.gz 392225
+SHA256 ee79caee70a44c23e54a2d9c9c97c58c4a26d5e947ef1a76fb3b0bed7792bfe6 knews-1.0b.1.tar.gz 392225
diff --git a/net-nntp/knews/knews-1.0.1b-r2.ebuild b/net-nntp/knews/knews-1.0.1b-r2.ebuild
index a5b841445fb4..d84729deb8be 100644
--- a/net-nntp/knews/knews-1.0.1b-r2.ebuild
+++ b/net-nntp/knews/knews-1.0.1b-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/knews/knews-1.0.1b-r2.ebuild,v 1.1 2005/01/17 19:55:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/knews/knews-1.0.1b-r2.ebuild,v 1.2 2006/11/04 02:07:44 swegener Exp $
 
-IUSE="xface png jpeg"
+inherit eutils
 
 MY_P=${PN}-1.0b.1
-S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="A threaded newsreader for X."
 SRC_URI="http://www.matematik.su.se/~kjj/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}-gentoo.diff.bz2"
@@ -14,65 +14,78 @@ HOMEPAGE="http://www.matematik.su.se/~kjj/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ~ppc"
+IUSE="xface png jpeg"
 
-DEPEND="virtual/x11
-	virtual/mta
-	=sys-apps/sed-4*
+S="${WORKDIR}"/${MY_P}
+
+RDEPEND="|| (
+		(
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXmu
+			x11-libs/libXpm
+			x11-libs/libXt
+		)
+		virtual/x11
+	)
 	jpeg? ( >=media-libs/jpeg-6 )
 	png? ( >=media-libs/libpng-1.2.1 )
-	xface? ( >=media-libs/compface-1.4 )"
+	xface? ( >=media-libs/compface-1.4 )
+	virtual/mta"
+
+DEPEND="${RDEPEND}
+	|| (
+		(
+			x11-proto/xproto
+			x11-misc/imake
+		)
+		virtual/x11
+	)
+	=sys-apps/sed-4*"
 
-# If knews used autoconf, we wouldn't need this patch.
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	use jpeg \
-		&& sed -i "s:\(#define HAVE_JPEG\).*:\1\t1:" configure.h
+	cd "${S}"
 
-	use png \
-		&& sed -i "s:\(#define HAVE_PNG\).*:\1\t1:" configure.h
+	epatch "${WORKDIR}"/${MY_P}-gentoo.diff
 
-	use xface \
-		&& sed -i "s:\(#define HAVE_COMPFACE\).*:\1\t1:" configure.h
+	use jpeg && sed -i "s:\(#define HAVE_JPEG\).*:\1\t1:" configure.h
+	use png && sed -i "s:\(#define HAVE_PNG\).*:\1\t1:" configure.h
+	use xface && sed -i "s:\(#define HAVE_COMPFACE\).*:\1\t1:" configure.h
 
-	sed -i "s:\(#define HAVE_XPM\).*:\1\t1:" configure.h
-
-	sed -i "s:\(#define DEFAULT_EDIT_COMMAND\).*:\1 \"${EDITOR} %s\":" configure.h
-
-	patch -p1 < ${WORKDIR}/${MY_P}-gentoo.diff || die
+	sed -i \
+		-e "s:\(#define HAVE_XPM\).*:\1\t1:" \
+		-e "s:\(#define DEFAULT_EDIT_COMMAND\).*:\1 \"${EDITOR} %s\":" \
+		configure.h
 }
 
 src_compile() {
-	xmkmf || die
-	make Makefiles || die
-	make clean || die
-	make all || die
-	pushd util/knewsd || die
-	xmkmf || die
-	make all || die
-	popd || die
+	xmkmf -a || die
+	emake CDEBUGFLAGS="${CFLAGS}" all || die
 }
 
 src_install () {
-	#Install knews
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} DOCHTMLDIR=/usr/share/doc/${P} \
-	MANPATH=/usr/share/man MANSUFFIX=1 install.man || die
+	emake -j1 \
+		DESTDIR="${D}" \
+		DOCHTMLDIR=/usr/share/doc/${PF} \
+		MANPATH=/usr/share/man \
+		MANSUFFIX=1 \
+		install install.man \
+		|| die "make install failed"
 
 	dodir /etc/knews
-	touch ${D}/etc//knews/mailname
-	touch ${D}/etc/knews/newsserver
+	touch "${D}"/etc/knews/mailname "${D}"/etc/knews/newsserver
 
-	#Other docs.
 	dodoc COPYING COPYRIGHT Changes README
 }
 
 
 pkg_postinst() {
-
 	einfo "Please be sure to set your local domain in"
 	einfo "    /etc/knews/mailname"
-	einfo ""
+	einfo
 	einfo "And please set your news server in"
 	einfo "    /etc/knews/newsserver"
 }