Allow compilation on non-GNU systems (#384311 by Fabian Groffen)

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 91 insertions, 12 deletions

diff --git a/net-misc/bti/ChangeLog b/net-misc/bti/ChangeLog
index b0dc75cc163f..e39bf44bece8 100644
--- a/net-misc/bti/ChangeLog
+++ b/net-misc/bti/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/bti
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/ChangeLog,v 1.20 2012/07/08 19:41:47 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/ChangeLog,v 1.21 2013/06/02 11:58:02 pacho Exp $
+
+*bti-031-r1 (02 Jun 2013)
+
+  02 Jun 2013; Pacho Ramos <pacho@gentoo.org> +bti-031-r1.ebuild,
+  +files/bti-031-nonGNU.patch:
+  Allow compilation on non-GNU systems (#384311 by Fabian Groffen)
 
   08 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Drop myself out of metadata.
diff --git a/net-misc/bti/Manifest b/net-misc/bti/Manifest
index 3107880c91b8..1a424844155f 100644
--- a/net-misc/bti/Manifest
+++ b/net-misc/bti/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX bti-031-nonGNU.patch 812 SHA256 81e6c7765140bb8b3da4154fc694b3d160db3624807400ab18a9677cea75cd25 SHA512 006fc5a5a03d86c4476678c3c7da708f5f98a840e14c73c2982a99dcbf00af315ac8f37ccc2a273e28a770f28cae2aaae12030834c319862a7844eafa50893c1 WHIRLPOOL 45298a655ae471005d4eae6e305a3902d974199f3a3fa3212ca8669b720d0cce6dded8f25a870d99b57ec39306107248c4e6210eca9173497f7a9d7f53560fd3
 DIST bti-029.tar.bz2 87261 SHA256 3a37ea2df36670b6f6bcbf68890670f484c94910aa99aad2a661ec2acc8b8aed
-DIST bti-031.tar.bz2 89027 SHA256 1b2f509a818ec6b1a036daff9d56a9c7b2640741df3d0ec89376775890187cd5
+DIST bti-031.tar.bz2 89027 SHA256 1b2f509a818ec6b1a036daff9d56a9c7b2640741df3d0ec89376775890187cd5 SHA512 d930013eb45bdfbaa914444460f74448c8bb62f255b2db5c771736ba7c5bb71d0cf4651db76eba0f05fbd6c6a175c7bc8942d7657588bd27e18bf409bf02d9fd WHIRLPOOL 43cf7b10e01cc0f0c076faec79f9ce2f18fdd23350a72d1d081638f2d0c55f323e395fe088379455e6846b12df13a76fcbd4cc6f4bfc2835040e5c961734ed01
 EBUILD bti-029.ebuild 1017 SHA256 c9c301369ada6591bec41fd1e1ea33e7b8c1c626fc728a5c526608bb6f33e486 SHA512 047954c9cf9abe48206c9cc6b41bd9b209cfbe419938294ef72122489069885037b10f270ac9c27844e61cf9baa7ac9ff841a93a5be409e1f351c4487dd0cb5a WHIRLPOOL f7d3f183ff57b6526e0d4c43b9244040b3a74d46169d2d1e115be3933fe6d88b7f8e2ab8f781277742fe063fada5a6c3429ed07eee0491f0612296dac5eaa975
+EBUILD bti-031-r1.ebuild 968 SHA256 94b50b1afaa4d18fe7862ecb3dde0f1a6be0f4ce9395ed8d34125a47a372d7ef SHA512 aedeaa94b582e4bb21655912a8c1cc832687fc1ac2691e743a821be3b7bfc9bd7ef42f57a81ec0d12231d45f8bc5dae9661fd355e33d17306db6430d7f7270ae WHIRLPOOL 31b0f3c938e406aad82fd93a9be441142f3a921debc88eab04823d2300044367d382e7a97a16a490aab6f3ee7f4f2fb3d4788d4691d4fa7517e73c7417a71f2b
 EBUILD bti-031.ebuild 1017 SHA256 97bb8f9893103a838fff3927ea18f5f539da0000da8990f817414a54661ff4af SHA512 22f5fa7b169c861eb0ef761fc788e13bfda7dca1595c44a3fb1c3edfcf41c9fb1cd0e69ac412f29967eb196b2ecc8c1ebafcb5a4ed0eef97b9deef176f679475 WHIRLPOOL c22d316f9f66dc3a9b8063f49fb2d56616d4001825607c3eb13005025b09702dc866e8fa98260f8b49f5ed6a77d56ae71e168e2c890dd59a8d07032ade680f35
-MISC ChangeLog 3129 SHA256 7188e1fde6ba2895de2fef9b44a3f16e4075d64590b1d6a4d4d58994f2714b8e SHA512 59da24332895c9084f83437ce791cf81104de4cdc3bb5a6618849957bc2c1d0af367b257b146726ad5aaa4adb54219bed3ad364428ccbcd6e1756d04cace1377 WHIRLPOOL b4806f21946184b956dc22c0e816162f5f93d06a3d66882aff54c4e86aca3252bc95de2118963447a44c52151e666804d7dff20402d5f88c31fe629898f17791
+MISC ChangeLog 3317 SHA256 1ebd15f69020f48df565d00479d74b7f822e3f4d8e0f8b45268b0505556d9b28 SHA512 59f6d8cb7695821c35fc1efaa5be69e5cd09aa6f81b3ffbd11f1dca6bf36acabefd7f1cd8c74d70b7e29c31dade9598b79de54e9a1c886877d545ec13bcc65ea WHIRLPOOL 58d82f05c9aefa0f39c37624de302eafed9d2f62f4cf91041f84b16aa37f3a3f61cdde9eb11f58dd2913a80f27813e06e34348217d33bd834f4be7b51669eb39
 MISC metadata.xml 243 SHA256 6dc6b2d737c1028d863f5d39c73d7023e8ff6a7b3f8384aa628a46f152a69f4e SHA512 0b3b60d7632e30066b99bdf7e943cc732693d5738bb91f59951de89a9e8c01f3ef7b88ed4cd29e3bde589e085bc7d204e05ec4aef1b2334ecf0220afb19af1e7 WHIRLPOOL e24f4e4b968591bf56e3f141220cc4384640fd1b09b39b1e4e51a37752d6d22a3fd9c4bf016982886d3e624cb666742a82cece3ba42aedccc845ac9bef6723ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP+eKAAAoJEBzRPIrUMBNC/4gH/0uwHcf4BZwdO5Z1hnpYEGQi
-Q8xVZyZK8nQhS/IPcXK2M+MalOT9W/aL9IAoo2jGk/rxAZNRA4g4XmmmRD1iLBo8
-x5J/K6KQ7Hu4rb8ufn7pNlFh9B2Ehkbm4VG1QBXV8ychzDkbvbUeABYLokSyoCpe
-g4e51W+AoYCsiDJTQGrBM6XkHG4ir5Jv2HFHGCtqCro5sDsw/D3Lwroe/bjauNrr
-PkLOXmon65YPprm611q8sfVwil1fa0oPQqA/47jemJWyTBsB+vvdwL4efZ0xaHrO
-H8BTddM6B945B+Kc7YaUi3bNzZolJ2feJ5eTPxhbQUw4tOpi+cQuQ7sbnazGOC4=
-=Id6U
+iEYEAREIAAYFAlGrM0sACgkQCaWpQKGI+9RnHACbBEyfGC3AnnKy91I+AwyKMccY
+jE0AnjLWziHWPPHsbFSGsZZ5p5+I3U9H
+=Hds2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/bti/bti-031-r1.ebuild b/net-misc/bti/bti-031-r1.ebuild
new file mode 100644
index 000000000000..4c05d6fcbf14
--- /dev/null
+++ b/net-misc/bti/bti-031-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/bti-031-r1.ebuild,v 1.1 2013/06/02 11:58:02 pacho Exp $
+
+EAPI=5
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="A command line twitter/identi.ca client"
+HOMEPAGE="http://gregkh.github.com/bti/"
+SRC_URI="mirror://kernel/software/web/bti/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="
+	net-misc/curl
+	dev-libs/libxml2
+	dev-libs/libpcre
+	net-libs/liboauth
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# Readline is dynamically loaded, for whatever reason, and can use
+# libedit as an alternative...
+RDEPEND="${RDEPEND}
+	|| ( sys-libs/readline dev-libs/libedit )"
+
+DOCS=( bti.example README RELEASE-NOTES )
+
+src_prepare() {
+	# Allow compilation on non-GNU systems, bug #384311
+	epatch "${FILESDIR}/${PN}-031-nonGNU.patch"
+}
+
+src_install() {
+	default
+	dobashcomp bti-bashcompletion
+}
diff --git a/net-misc/bti/files/bti-031-nonGNU.patch b/net-misc/bti/files/bti-031-nonGNU.patch
new file mode 100644
index 000000000000..14b10c1fb832
--- /dev/null
+++ b/net-misc/bti/files/bti-031-nonGNU.patch
@@ -0,0 +1,32 @@
+Avoid using strchrnul, it's a GNU addition.  The code in question,
+actually doesn't really benefit from strchrnul's behaviour.
+
+--- config.c
++++ config.c
+@@ -351,20 +351,21 @@
+ 		 * marker if it occurs at the beginning of the line, or after
+ 		 * whitespace
+ 		 */
+-		hashmarker = strchrnul(line, '#');
++		hashmarker = strchr(line, '#');
+ 		if (line == hashmarker)
+ 			line[0] = '\0';
+ 		else {
+-			while (hashmarker[0] != '\0') {
++			while (hashmarker != NULL) {
+ 				--hashmarker;
+-				if (isblank(hashmarker[0]))
++				if (isblank(hashmarker[0])) {
+ 					hashmarker[0] = '\0';
+-				else {
++					break;
++				} else {
+ 					/*
+ 					 * false positive; '#' occured
+ 					 * within a string
+ 					 */
+-					hashmarker = strchrnul(hashmarker+2, '#');
++					hashmarker = strchr(hashmarker+2, '#');
+ 				}
+ 			}
+ 		}