Ported to modular X dependencies, bug #153214.

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 85 insertions, 49 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/Manifest b/net-nntp/knews/Manifest
index 80500a969c34..612ffd621fc3 100644
--- a/net-nntp/knews/Manifest
+++ b/net-nntp/knews/Manifest
@@ -1,15 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dcec3ca82dc08adeff0c8eb8e3dac814 knews-1.0.1b-r2.ebuild 1854
-MD5 0205ea8aa3d0e95be3acff6698087275 ChangeLog 1479
-MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
-MD5 a134c01ff5938de372b1a0a6096115b6 files/digest-knews-1.0.1b-r2 135
+AUX knews-1.0.1b-r1.patch 638 RMD160 8cdfedee9d91f30f577965d031f138729d2fd6e9 SHA1 6784c0f7cad6cbdf4f9911d8748357b83980897d SHA256 aef91523e2606c8e02455b1ed259bcad199054a4f0d6ca1f002af3e02950691c
 MD5 d86069c6b8c7c978700693cc8b427273 files/knews-1.0.1b-r1.patch 638
+RMD160 8cdfedee9d91f30f577965d031f138729d2fd6e9 files/knews-1.0.1b-r1.patch 638
+SHA256 aef91523e2606c8e02455b1ed259bcad199054a4f0d6ca1f002af3e02950691c files/knews-1.0.1b-r1.patch 638
+DIST knews-1.0b.1-gentoo.diff.bz2 3892 RMD160 a9bd2c2d56d77cb0febbcfacdbcb5d38526d3b39 SHA1 d33bd4cbc983aed81fa00b1f6c2e2f4c23a7398a SHA256 bf0cf4bd164b8515afe03e987e5e3dccae8340bf9faf1ae6718948c8cee0f571
+DIST knews-1.0b.1.tar.gz 392225 RMD160 c29cd8401bd802852f875d3c531f2f0f8805cc43 SHA1 b56046036d4c6688439e6730b8ae2a2eade922db SHA256 ee79caee70a44c23e54a2d9c9c97c58c4a26d5e947ef1a76fb3b0bed7792bfe6
+EBUILD knews-1.0.1b-r2.ebuild 1938 RMD160 fb9a12326cdd14f4428789995c8b430e919702b4 SHA1 164ba99ffc646a96399fb8a6f2638ef905578546 SHA256 d7ff29802bb0e731e399dce3a07a499cfcb27b50406a0ebf0c21a7b367e55910
+MD5 cba79e8673dc46f1c8a2f2fb8900f38f knews-1.0.1b-r2.ebuild 1938
+RMD160 fb9a12326cdd14f4428789995c8b430e919702b4 knews-1.0.1b-r2.ebuild 1938
+SHA256 d7ff29802bb0e731e399dce3a07a499cfcb27b50406a0ebf0c21a7b367e55910 knews-1.0.1b-r2.ebuild 1938
+MISC ChangeLog 1603 RMD160 9e2c90aae58edbf43a5b526a324499e634603c11 SHA1 24d210384db4be55a27a3f6f4c766f47b2f49e4c SHA256 662132a13f9a8786db22f8246a4a99a99521e6ae08b394f073e14451513a6357
+MD5 088e5ba5c4cf170cec437ee5fe15e5cc ChangeLog 1603
+RMD160 9e2c90aae58edbf43a5b526a324499e634603c11 ChangeLog 1603
+SHA256 662132a13f9a8786db22f8246a4a99a99521e6ae08b394f073e14451513a6357 ChangeLog 1603
+MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153
+MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
+RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 metadata.xml 161
+SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153 metadata.xml 161
+MD5 497e51a85595c3709a4ed98031200cb5 files/digest-knews-1.0.1b-r2 497
+RMD160 88bd7e0bb003e268835ea1d88c415787dbe940d0 files/digest-knews-1.0.1b-r2 497
+SHA256 7ba2efe052e44ea39034651021288b28480e7bbc90cac0df1646afbd0b2b3881 files/digest-knews-1.0.1b-r2 497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFB7DDZI1lqEGTUzyQRAuAwAJ94KHsZa51nIrLV3hzEfqn3zXPAHACgoZw8
-6BykPLWHnrLYFzCfgxUFdD4=
-=8Ssz
+iD8DBQFFS/X2I1lqEGTUzyQRAinPAKCM4gb9Xw+q6Qd8XOlpkj2goPBpIQCbBZg6
+mHqhBzGyuXFp6VBeuD6gdCo=
+=6AIz
 -----END PGP SIGNATURE-----
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"
 }