Fix unicode display for bug #309307 and remove old

Package-Manager: portage-2.1.7.16/cvs/Linux i686

9 files changed, 22 insertions, 282 deletions

diff --git a/net-news/snownews/ChangeLog b/net-news/snownews/ChangeLog
index 7e98cde22e8d..c42a82c3e155 100644
--- a/net-news/snownews/ChangeLog
+++ b/net-news/snownews/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-news/snownews
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v 1.29 2009/09/22 19:17:49 cedk Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v 1.30 2010/03/14 11:26:50 cedk Exp $
+
+*snownews-1.5.12-r1 (14 Mar 2010)
+
+  14 Mar 2010; Cédric Krier <cedk@gentoo.org> -snownews-1.5.7-r2.ebuild,
+  -files/snownews-1.5.7-manpath.patch, -files/snownews-1.5.7-stdint.patch,
+  -snownews-1.5.8.ebuild, -snownews-1.5.9.ebuild, -snownews-1.5.11.ebuild,
+  -snownews-1.5.12.ebuild, +snownews-1.5.12-r1.ebuild:
+  Fix unicode display for bug #309307 and remove old
 
 *snownews-1.5.12 (22 Sep 2009)
 
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index 6c545f519586..9729eef3a5ab 100644
--- a/net-news/snownews/Manifest
+++ b/net-news/snownews/Manifest
@@ -1,16 +1,6 @@
-AUX snownews-1.5.7-manpath.patch 1345 RMD160 87008a4a0203e00ea11e26547ccbb8224230bf5b SHA1 0beb65da40ce59592a08bd9a76cfba041d2ded9e SHA256 552963658a07483ec753295e549ac4b51419f710320548dcef25926d69cf883d
-AUX snownews-1.5.7-stdint.patch 405 RMD160 bfe2b19ea3a3987ca76cc7437ebe6d6dddd94b13 SHA1 7a5175326884fe4c9135b299901cf516ef58e9f9 SHA256 4f5a6b426759b6d69dc0fb716c62ed8d3296a40ee8715a054046a5abffe0bb71
 DIST snownews-1.5.10.tar.gz 171699 RMD160 4650fc194c458fbf212f81cfc5e6080a3d4fb26d SHA1 e5a068418f34f3437267eff6356729b9d8714701 SHA256 76d91d17efcfa4814f6e96e20430fb216bd76f190453b2cb4e1fb330a8a9dee8
-DIST snownews-1.5.11.tar.gz 172814 RMD160 ccb1e021ad25ef2f4f420fe44f1c81833f97ad88 SHA1 64ed1c648ed50cada294bc503e100496a7dd9f09 SHA256 03a7d4382239e64f0415678820d613501a7af88c6ef73a7673c3b76c4c203e7c
 DIST snownews-1.5.12.tar.gz 167944 RMD160 dbe9c6b88e77ce37bb23e4d3ddc8d63f8bd66151 SHA1 b3addaac25c2c093aa5e60b8b89e50e7d7450bcf SHA256 26dd96e9345d9cbc1c0c9470417080dd0c3eb31e7ea944f78f3302d7060ecb90
-DIST snownews-1.5.7.tar.gz 161504 RMD160 5aa839bb92a8ee51b2b1fda74ddf22279665061b SHA1 d732c056d8c193339cae4c07dfaf0093607c90c0 SHA256 1afab69e03f351e670187ba35cea363aa6113a44b8fe243ca98835b89e672653
-DIST snownews-1.5.8.tar.gz 166612 RMD160 5ba8827a70afaeb5ba53bd9b468d347eb20aa911 SHA1 3b1d6b248121ae790a98277644828c74e4f1aa2d SHA256 954daf9c58eaee9345e7dcf86a6aa7d4608f8c15ea4aa44f03d86dd31ea6f2f9
-DIST snownews-1.5.9.tar.gz 170666 RMD160 478c8b60e3bfb1f0eb13268c6deb2a258831aa6b SHA1 a3c778272c1ae599e11f283fab1bd267ca3af011 SHA256 6137372c2709643e7ebcda893de656757abd88ddc93c827b7976531fd8fa064d
 EBUILD snownews-1.5.10.ebuild 1146 RMD160 04804b7d70890f61714b10a08c84ee17f220feee SHA1 b8e4d5843807d151241b04271abb00a6683f1258 SHA256 c1fa6aab3dd0b4a445260570ccbde0027d6c68262b23f03fc98f3603b69c4e5c
-EBUILD snownews-1.5.11.ebuild 1148 RMD160 cbdcea6a5bd5de3bcd50d9cbf5724d421a022b84 SHA1 646fdbbc288b3b0eda6caf3b8f31534b700d7d55 SHA256 bd0a108a50ffe7ca29632ee329b0ca736fe8795ade3a4c67d99fc2867d8fad21
-EBUILD snownews-1.5.12.ebuild 1125 RMD160 f84f2bd84477f8fc8f7aed9bdf8f7249934c85fd SHA1 06751850910e818df55fac025ccd94ff1d3af133 SHA256 bef0761a3835b1e7c01a08288715dfa040b6d5bc06d29816b59755e10fe57fa9
-EBUILD snownews-1.5.7-r2.ebuild 1466 RMD160 96220ef988bf8a8402dc05e9bf996e60eb5c04de SHA1 fa903ae3153acb9d91d306d575d78f8830ef1c49 SHA256 bc6eb8c151767a2194abdd0089f0259f179f0e6ac93546d672de4dd728f99fcb
-EBUILD snownews-1.5.8.ebuild 1415 RMD160 2a0653921751a880af943fdff268d5eeaaaba886 SHA1 5ad9a9586ad49bf28e15bd7dba51d6d1cb3c67f3 SHA256 40a5421f197ee295d6338e5be5f3968c07d12873e6af055b9d709249483d0203
-EBUILD snownews-1.5.9.ebuild 1415 RMD160 2f9f6b07f26e9d0580b6227b9ad940da6f979915 SHA1 df6c710695359a96a32b54bba958896bde94ef7a SHA256 f9d39081209330264572f44e1cd410decbfe32744f71fad1d896b571c151b1a0
-MISC ChangeLog 6362 RMD160 03012e9ddaf0b5fd62f3a324c34690814fe400e4 SHA1 c4ed8c54a31cc771b879b399ace0489c00f107ff SHA256 8b7416df5aab2377465b0f85309f34adbd47aa8c21f1a71b9072a5e52e8a9597
+EBUILD snownews-1.5.12-r1.ebuild 1402 RMD160 af1fa1e2ecae14a7c34098cb17766595d69ece53 SHA1 2bfc9a1b6dc58005a35d543c28bb03ae802c409e SHA256 4976bffd70a444c24a5a54c8a43c3c41afd68844a4585cbbd2c12a0fe7ccb5f2
+MISC ChangeLog 6730 RMD160 01e5572bc83a8f5b7d76a606e1a319e198cf2fc4 SHA1 08fc700cb166731011abff37fcab503ced1f170c SHA256 72dd19b19c7f19d3a0ac28bd92837f05f21f37aebd0593194d2b36544181dd14
 MISC metadata.xml 247 RMD160 74386d37b44f1f52420db27eb065704ca3792b08 SHA1 331e0cb0393cba71957b85acbcb170a77905e70e SHA256 5b84266e8a80e0234bbc5d8ad1a1d5d878c1960f7a1aba1871c0d3b281e9ff8f
diff --git a/net-news/snownews/files/snownews-1.5.7-manpath.patch b/net-news/snownews/files/snownews-1.5.7-manpath.patch
deleted file mode 100644
index b6bd7553c839..000000000000
--- a/net-news/snownews/files/snownews-1.5.7-manpath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru snownews-1.5.7~/Makefile snownews-1.5.7/Makefile
---- snownews-1.5.7~/Makefile	2007-01-23 23:49:40.000000000 +0100
-+++ snownews-1.5.7/Makefile	2007-01-23 23:49:53.000000000 +0100
-@@ -2,6 +2,7 @@
- MAKE=       make
- INSTALL=    install
- LOCALEPATH= $(PREFIX)/share/locale
-+MANPATH=    $(PREFIX)/share
- 
- ### Compiler/linker flags   ###
- ### Generated via configure ###
-@@ -75,17 +76,17 @@
- 	done
- 
- install-man: manpages
--	if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \
--		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
-+	if [ ! -d "$(DESTDIR)$(MANPATH)/man/man1" ]; then \
-+		mkdir -p $(DESTDIR)$(MANPATH)/man/man1; \
- 	fi
--	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
--	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
-+	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(MANPATH)/man/man1
-+	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(MANPATH)/man/man1
- 	
- 	for L in $(LANGS); do \
--		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
--			mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \
-+		if [ ! -d "$(DESTDIR)$(MANPATH)/man/$$L/man1" ]; then \
-+			mkdir -p $(DESTDIR)$(MANPATH)/man/$$L/man1; \
- 		fi; \
--		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/man/$$L/man1; \
-+		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(MANPATH)/man/$$L/man1; \
- 	done
- 
- ### Cleanup ###
diff --git a/net-news/snownews/files/snownews-1.5.7-stdint.patch b/net-news/snownews/files/snownews-1.5.7-stdint.patch
deleted file mode 100644
index f6c81e79925a..000000000000
--- a/net-news/snownews/files/snownews-1.5.7-stdint.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru snownews-1.5.7~/md5.h snownews-1.5.7/md5.h
---- snownews-1.5.7~/md5.h	2006-12-03 16:36:54.000000000 +0100
-+++ snownews-1.5.7/md5.h	2006-12-03 16:47:23.000000000 +0100
-@@ -31,11 +31,8 @@
- #ifndef MD5_H
- #define MD5_H
- 
--#ifdef __alpha
--typedef unsigned int uint32;
--#else
--typedef unsigned long uint32;
--#endif
-+#include <stdint.h>
-+typedef uint32_t uint32;
- 
- struct MD5Context {
- 	uint32 buf[4];
diff --git a/net-news/snownews/snownews-1.5.11.ebuild b/net-news/snownews/snownews-1.5.11.ebuild
deleted file mode 100644
index 5612adebf17f..000000000000
--- a/net-news/snownews/snownews-1.5.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.11.ebuild,v 1.1 2009/03/20 10:31:07 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader"
-HOMEPAGE="http://snownews.kcore.de/"
-SRC_URI="http://home.kcore.de/~kiza/software/snownews/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libxml2-2.5.6
-	>=sys-libs/ncurses-5.3"
-
-RDEPEND="dev-perl/XML-LibXML
-	dev-perl/XML-LibXSLT
-	dev-perl/libwww-perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/-O2//" \
-		configure
-
-	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' \
-		Makefile
-
-	#Bug #121805
-	epatch "${FILESDIR}"/${PN}-1.5.7-stdint.patch
-}
-
-src_compile() {
-	local conf="--prefix=/usr"
-	./configure ${conf} || die "configure failed"
-	emake CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install || die "make install failed"
-
-	dodoc AUTHOR CREDITS README README.de README.patching
-}
diff --git a/net-news/snownews/snownews-1.5.8.ebuild b/net-news/snownews/snownews-1.5.12-r1.ebuild
index 1ee1ddbf123d..37d2d50f6825 100644
--- a/net-news/snownews/snownews-1.5.8.ebuild
+++ b/net-news/snownews/snownews-1.5.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.8.ebuild,v 1.1 2008/01/10 23:10:46 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild,v 1.1 2010/03/14 11:26:50 cedk Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,9 +14,11 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="unicode"
 
 DEPEND=">=dev-libs/libxml2-2.5.6
-	>=sys-libs/ncurses-5.3"
+	>=sys-libs/ncurses-5.3
+	dev-libs/openssl"
 
-RDEPEND="dev-perl/XML-LibXML
+RDEPEND="${DEPEND}
+	dev-perl/XML-LibXML
 	dev-perl/XML-LibXSLT
 	dev-perl/libwww-perl"
 
@@ -31,19 +33,18 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	use unicode && sed -i -e "s/-lncurses/-lncursesw/" \
+		configure
+
 	sed -i -e "s/-O2//" \
 		configure
 
 	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' \
 		Makefile
-
-	#Bug #121805
-	epatch "${FILESDIR}"/${PN}-1.5.7-stdint.patch
 }
 
 src_compile() {
 	local conf="--prefix=/usr"
-	use unicode && conf="${conf} --charset=UTF-8"
 	./configure ${conf} || die "configure failed"
 	emake CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
@@ -51,5 +52,5 @@ src_compile() {
 src_install() {
 	emake PREFIX="${D}/usr" install || die "make install failed"
 
-	dodoc AUTHOR CREDITS README README.colors README.de README.patching
+	dodoc AUTHOR Changelog CREDITS README README.de README.patching
 }
diff --git a/net-news/snownews/snownews-1.5.12.ebuild b/net-news/snownews/snownews-1.5.12.ebuild
deleted file mode 100644
index a4c6b161bb21..000000000000
--- a/net-news/snownews/snownews-1.5.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.12.ebuild,v 1.1 2009/09/22 19:17:49 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader"
-HOMEPAGE="http://snownews.kcore.de/"
-SRC_URI="http://home.kcore.de/~kiza/software/snownews/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libxml2-2.5.6
-	>=sys-libs/ncurses-5.3
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	dev-perl/XML-LibXML
-	dev-perl/XML-LibXSLT
-	dev-perl/libwww-perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/-O2//" \
-		configure
-
-	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' \
-		Makefile
-}
-
-src_compile() {
-	local conf="--prefix=/usr"
-	./configure ${conf} || die "configure failed"
-	emake CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install || die "make install failed"
-
-	dodoc AUTHOR Changelog CREDITS README README.de README.patching
-}
diff --git a/net-news/snownews/snownews-1.5.7-r2.ebuild b/net-news/snownews/snownews-1.5.7-r2.ebuild
deleted file mode 100644
index 73d786ae624b..000000000000
--- a/net-news/snownews/snownews-1.5.7-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.7-r2.ebuild,v 1.5 2007/03/17 19:03:37 beandog Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader"
-HOMEPAGE="http://snownews.kcore.de/"
-SRC_URI="http://home.kcore.de/~kiza/software/snownews/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="unicode"
-
-DEPEND=">=dev-libs/libxml2-2.5.6
-	>=sys-libs/ncurses-5.3"
-
-RDEPEND="dev-perl/XML-LibXML
-	dev-perl/XML-LibXSLT
-	dev-perl/libwww-perl"
-
-pkg_setup() {
-	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
-		eerror "sys-libs/ncurses must be build with unicode"
-		die "${PN} requires sys-libs/ncurses with USE=unicode"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/-O2//" \
-		configure
-
-	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' \
-		Makefile
-
-	#Bug #121805
-	epatch "${FILESDIR}"/${P}-stdint.patch
-
-	#Bug #163439
-	epatch "${FILESDIR}"/${P}-manpath.patch
-}
-
-src_compile() {
-	local conf="--prefix=/usr"
-	use unicode && conf="${conf} --charset=UTF-8"
-	./configure ${conf} || die "configure failed"
-	emake CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install || die "make install failed"
-
-	dodoc AUTHOR CREDITS README README.colors README.de README.patching
-}
diff --git a/net-news/snownews/snownews-1.5.9.ebuild b/net-news/snownews/snownews-1.5.9.ebuild
deleted file mode 100644
index e35f7c0eaba7..000000000000
--- a/net-news/snownews/snownews-1.5.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.9.ebuild,v 1.2 2008/02/18 16:49:38 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader"
-HOMEPAGE="http://snownews.kcore.de/"
-SRC_URI="http://home.kcore.de/~kiza/software/snownews/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="unicode"
-
-DEPEND=">=dev-libs/libxml2-2.5.6
-	>=sys-libs/ncurses-5.3"
-
-RDEPEND="dev-perl/XML-LibXML
-	dev-perl/XML-LibXSLT
-	dev-perl/libwww-perl"
-
-pkg_setup() {
-	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
-		eerror "sys-libs/ncurses must be build with unicode"
-		die "${PN} requires sys-libs/ncurses with USE=unicode"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/-O2//" \
-		configure
-
-	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' \
-		Makefile
-
-	#Bug #121805
-	epatch "${FILESDIR}"/${PN}-1.5.7-stdint.patch
-}
-
-src_compile() {
-	local conf="--prefix=/usr"
-	use unicode && conf="${conf} --charset=UTF-8"
-	./configure ${conf} || die "configure failed"
-	emake CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install || die "make install failed"
-
-	dodoc AUTHOR CREDITS README README.colors README.de README.patching
-}