Disable broken libpng support wrt #309003. Use correct app-defaults directory.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 93 insertions, 13 deletions

diff --git a/net-nntp/knews/ChangeLog b/net-nntp/knews/ChangeLog
index 3c993197746d..3258afe862db 100644
--- a/net-nntp/knews/ChangeLog
+++ b/net-nntp/knews/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nntp/knews
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/knews/ChangeLog,v 1.5 2008/11/17 20:50:36 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/knews/ChangeLog,v 1.6 2010/03/12 11:37:09 ssuominen Exp $
+
+*knews-1.0.1b-r3 (12 Mar 2010)
+
+  12 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +knews-1.0.1b-r3.ebuild:
+  Disable broken libpng support wrt #309003. Use correct app-defaults
+  directory.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/knews-1.0.1b-r1.patch:
diff --git a/net-nntp/knews/Manifest b/net-nntp/knews/Manifest
index 36776f92f680..0b8118a2a8d0 100644
--- a/net-nntp/knews/Manifest
+++ b/net-nntp/knews/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX knews-1.0.1b-r1.patch 641 RMD160 63bca4510fb53f95b34325d1f5a09060df79ac0e SHA1 54d0e0b45aab9e0d3ef085b75b2a5876999a1708 SHA256 bdcf79c98681a0d04c6f87ce9c96c9fda5a1877d6b41528966feeb5830dbb60e
 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 1879 RMD160 6df4522384faaeeb8080f62092812d99126540df SHA1 c9417574c2a36f0222c1d28b785db0e48a5fa042 SHA256 3812374c6656dddee77d43bf089a7faf5de2422149fd7d10c0bc4597f975353e
-MISC ChangeLog 1838 RMD160 3cec920d49e4e897c0fe54d4d4fa742d9aa51f1b SHA1 341569139e6bb3907f6867370a31202b0755498a SHA256 639628de95a719fedc1b4e2a40cb0db32b07d5221e9e84e91d525a6d44364bde
+EBUILD knews-1.0.1b-r3.ebuild 1905 RMD160 8714e19385eb5328a46e52124d06dad7bba01b0c SHA1 a7a102af597f0bc3868a6b11c81e23031428cf2a SHA256 916fd6bd7044887b11781b32429e002f6a4cec234b3f90002e328ffe06f90079
+MISC ChangeLog 2035 RMD160 1f6e86c8d8e5fa05fcabe0bdf893ed9d79a59b7a SHA1 4f35f5d53390f45563ce99f9bdc5b4e1d35fbeb8 SHA256 64abb5c064165eca08f3c9bded95f1a35bdd5875972663d4ac07cadc9b68fbed
 MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh2SEACgkQAiZjviIA2Xi4YgCfaOTTPWUuE2Mqcb/Yrm20YlgZ
-JngAnitrgNPv/ymcKrJmOlCcTvAY1wBm
-=2IIv
------END PGP SIGNATURE-----
diff --git a/net-nntp/knews/knews-1.0.1b-r3.ebuild b/net-nntp/knews/knews-1.0.1b-r3.ebuild
new file mode 100644
index 000000000000..8e02cdf80ff6
--- /dev/null
+++ b/net-nntp/knews/knews-1.0.1b-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/03/12 11:37:09 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+MY_P=${PN}-1.0b.1
+
+DESCRIPTION="A threaded newsreader for X."
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-gentoo.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="xface jpeg"
+
+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
+	jpeg? ( media-libs/jpeg:0 )
+	xface? ( >=media-libs/compface-1.4 )
+	virtual/mta"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-misc/gccmakedep
+	x11-misc/imake
+	=sys-apps/sed-4*"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${MY_P}-gentoo.diff
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=309003
+	# use png && sed -i "s:\(#define HAVE_PNG\).*:\1\t1:" configure.h
+	use jpeg && sed -i "s:\(#define HAVE_JPEG\).*:\1\t1:" configure.h
+	use xface && sed -i "s:\(#define HAVE_COMPFACE\).*:\1\t1:" configure.h
+
+	sed -i \
+		-e "s:\(#define HAVE_XPM\).*:\1\t1:" \
+		-e "s:\(#define DEFAULT_EDIT_COMMAND\).*:\1 \"${EDITOR} %s\":" \
+		configure.h
+}
+
+src_compile() {
+	xmkmf -a || die
+	emake CDEBUGFLAGS="${CFLAGS}" all || die
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		DOCHTMLDIR=/usr/share/doc/${PF} \
+		MANPATH=/usr/share/man \
+		MANSUFFIX=1 \
+		install install.man || die
+
+	rm -rf "${D}"/{etc/X11,usr/lib}
+
+	insinto /usr/share/X11/app-defaults
+	newins src/Knews.ad Knews || die
+
+	dodir /etc/knews
+	touch "${D}"/etc/knews/mailname "${D}"/etc/knews/newsserver
+
+	dodoc Changes README
+}
+
+pkg_postinst() {
+	einfo "Please be sure to set your local domain in"
+	einfo "    /etc/knews/mailname"
+	einfo
+	einfo "And please set your news server in"
+	einfo "    /etc/knews/newsserver"
+}