net-news/newsbeuter: musl iconv does not know //TRANSLIT

4 files changed, 118 insertions, 0 deletions

diff --git a/net-news/newsbeuter/Manifest b/net-news/newsbeuter/Manifest
new file mode 100644
index 0000000..2a494a9
--- /dev/null
+++ b/net-news/newsbeuter/Manifest
@@ -0,0 +1,4 @@
+AUX newsbeuter-2.8-musl.patch 1774 SHA256 01bc5b5d231181215eb051db9d9717e05f94578db70b9889606a8d2d027664ba SHA512 479b243faf6b39b3473ce16e0ade892e7055613387bcecef8e3bc900733a270cd2c4a6e3493e1244047079cadabc0a9eb20b2e97d4eecfbf964adf56f0db94eb WHIRLPOOL 73950da6b97f6d5617dd57d52bf27569b3be8c9f473e40360e648ded4a160cc887bfce11e98587784f7722d07a57c4dd66a82f8d17baa3353446199663a7b0a5
+DIST newsbeuter-2.8.tar.gz 431299 SHA256 c872a068ec7792680b11126230dff240dee72acdab8f153016ba5ef83c8a7804 SHA512 b87c8118c4b450fe774dda73f83f485fada48e7dc308cd4c61e650b6e04a52b62eee075426d02aa5521edefced0ec09b599a51086ddee40408e063e94c6b259a WHIRLPOOL ad278481e885845f09f766aadfdb52b75c970f28f0c1b24ec27508efd4647768de91509a0ed3d57c4b009817ead546e0d1ac8a45815ab73dc619724eb7a49756
+EBUILD newsbeuter-2.8-r99.ebuild 1212 SHA256 22bd58f47b8a227e0c7ee75551335cc8fac56aad5556faef63b9e17f82eacc5d SHA512 9d6167fee234ab196b36927a2af0f4673027ae2469234c7436dc2449dd8516cf87abb42df3cad9cdf7358c1199466397e7c6d9b5aa2d761227907908aae42fcf WHIRLPOOL bcc5078757754891bcc9eaa0d788d6d7d3e433929add7583512e5f5095eecb604184424e7bbad6c6b5e7a9f250b5fdfc9397fa9e9dac497a15aa8ba8f033f233
+MISC metadata.xml 405 SHA256 72d5989efe3e9aa0fc0102ce2a3cd62af3a3b40beaeb42d9321149ca02387a15 SHA512 62694bdd8d3c988d48945c6ae926e20509fcc660d2584a69adcafad2c6abaa810364603ab5ca3b79cac128a2cb31486cac4b9b2903117ae73bf6e283145289dc WHIRLPOOL 6c5473ea7fe0652e0c8890ec81e4043e2b55b1cc46054e8c6b7a1575a190669b33d6012c9e30e1574696d562936684fa1ba086309355265fe47d948af7a1517f
diff --git a/net-news/newsbeuter/files/newsbeuter-2.8-musl.patch b/net-news/newsbeuter/files/newsbeuter-2.8-musl.patch
new file mode 100644
index 0000000..562fba5
--- /dev/null
+++ b/net-news/newsbeuter/files/newsbeuter-2.8-musl.patch
@@ -0,0 +1,43 @@
+https://github.com/akrennmair/newsbeuter/issues/174
+
+diff -ur a/newsbeuter-2.8/src/stflpp.cpp b/newsbeuter-2.8/src/stflpp.cpp
+--- a/newsbeuter-2.8/src/stflpp.cpp	2014-01-19 01:10:41.000000000 -0200
++++ b/newsbeuter-2.8/src/stflpp.cpp	2015-04-09 23:49:37.768386550 -0200
+@@ -16,7 +16,7 @@
+  */
+ 
+ stfl::form::form(const std::string& text) : f(0) {
+-	ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET)) + "//TRANSLIT").c_str());
++	ipool = stfl_ipool_create(nl_langinfo(CODESET));
+ 	if (!ipool) {
+ 		throw exception(errno);
+ 	}
+@@ -82,7 +82,7 @@
+ 
+ std::string stfl::quote(const std::string& text) {
+ 	scope_mutex lock(&quote_mtx);
+-	stfl_ipool * ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET)) + "//TRANSLIT").c_str());
++	stfl_ipool * ipool = stfl_ipool_create(nl_langinfo(CODESET));
+ 	std::string retval = stfl_ipool_fromwc(ipool,stfl_quote(stfl_ipool_towc(ipool,text.c_str())));
+ 	stfl_ipool_destroy(ipool);
+ 	return retval;
+diff -ur a/newsbeuter-2.8/src/utils.cpp b/newsbeuter-2.8/src/utils.cpp
+--- a/newsbeuter-2.8/src/utils.cpp	2014-01-19 01:10:41.000000000 -0200
++++ b/newsbeuter-2.8/src/utils.cpp	2015-04-09 23:47:39.570864222 -0200
+@@ -262,7 +262,7 @@
+ 	if (strcasecmp(tocode.c_str(), fromcode.c_str())==0)
+ 		return text;
+ 
+-	iconv_t cd = ::iconv_open((tocode + "//TRANSLIT").c_str(), fromcode.c_str());
++	iconv_t cd = ::iconv_open(tocode.c_str(), fromcode.c_str());
+ 
+ 	if (cd == reinterpret_cast<iconv_t>(-1))
+ 		return result;
+@@ -493,7 +493,6 @@
+ 
+ std::string utils::wstr2str(const std::wstring& wstr) {
+ 	std::string codeset = nl_langinfo(CODESET);
+-	codeset.append("//TRANSLIT");
+ 	struct stfl_ipool * ipool = stfl_ipool_create(codeset.c_str());
+ 	std::string result = stfl_ipool_fromwc(ipool, wstr.c_str());
+ 	stfl_ipool_destroy(ipool);
diff --git a/net-news/newsbeuter/metadata.xml b/net-news/newsbeuter/metadata.xml
new file mode 100644
index 0000000..eb32917
--- /dev/null
+++ b/net-news/newsbeuter/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<longdescription lang="en">
+		newsbeuter is an RSS feed reader for the text console. It is designed
+		to run Unix-like operating systems such as Linux.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-news/newsbeuter/newsbeuter-2.8-r99.ebuild b/net-news/newsbeuter/newsbeuter-2.8-r99.ebuild
new file mode 100644
index 0000000..09c3cea
--- /dev/null
+++ b/net-news/newsbeuter/newsbeuter-2.8-r99.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-2.8.ebuild,v 1.3 2014/03/29 06:08:40 ago Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A RSS/Atom feed reader for the text console"
+HOMEPAGE="http://www.newsbeuter.org/index.html"
+SRC_URI="http://www.${PN}.org/downloads/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="test"
+
+RDEPEND=">=dev-db/sqlite-3.5:3
+	>=dev-libs/stfl-0.21
+	>=net-misc/curl-7.18.0
+	dev-libs/json-c:=
+	dev-libs/libxml2"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	sys-devel/gettext
+	test? (
+		dev-libs/boost
+		sys-devel/bc
+	)"
+
+# tests require network access
+RESTRICT="test"
+
+src_prepare() {
+	sed -i 's:-ggdb::' Makefile || die
+	epatch "${FILESDIR}"/${P}-musl.patch
+}
+
+src_configure() {
+	./config.sh || die
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+src_test() {
+	emake test
+	# Tests fail if in ${S} rather than in ${S}/test
+	cd "${S}"/test
+	./test || die
+}
+
+src_install() {
+	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
+	dodoc AUTHORS README CHANGES
+}