Fix unicode display for bug #309307 and remove old

(Portage version: 2.1.7.16/cvs/Linux i686)

8 files changed, 20 insertions, 270 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/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
-}