gentoo resync : 14.07.2018

7 files changed, 167 insertions, 0 deletions

diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
new file mode 100644
index 000000000000..acf3d0b3bb6f
--- /dev/null
+++ b/app-misc/cw/Manifest
@@ -0,0 +1,7 @@
+AUX 1.0.16-collision.patch 1367 BLAKE2B b36dc61f1a898c08e13e527adf219b47a15cad8a9f9f11a9e80adb289cff592349f16189f4e8f776bcf462f6488ef4be24b77fb70bf0f8f2cdff6517786ae16c SHA512 2f5e2dc0eb6af383207cd514a5e42bd1cd03f8748a8c1c66d0d83b7a5abd2fafc108a2207ff96bef5b74b9044c21fbe185e3b47a090d11387c7d1bb8f7684e76
+AUX 1.0.16-format-security.patch 412 BLAKE2B 07465169761141e6bfd415ac78366df1a27e8bb38d3ffe2091653235cf790f72b25e80b6ab744eeebd16b4ac57acfad20089d052ee76c728212d0a60ffcc6287 SHA512 604a22a47e36933d4b2788c1acfe1930e2935dac14dbad5a717ce69b26463bdffcc54aa74bf5dfc22631b3a587ca56bda359d86cebf9fa1ad7c7a235fb71a5db
+AUX 1.0.16-ldflags.patch 486 BLAKE2B 350b72daa7c419ff4b8de846d33921450d55d94d26714438f93d197bb620e9d1a6d70c681f4547b3b72fe7c3ee31fb0700d3bd1f8ee8e2dc8820c63b7be4c461 SHA512 75883411ef18c739e6f86ba53a5b515e8081ac10d1b3e894de9bee4dd0040620f0fe09786085acd325669475d0d1e99b4d46554a68ebffcad18e50cb281cabfe
+AUX 1.0.16-path.patch 550 BLAKE2B d14ac37b4dc3a951da4f472598e1a3a8863d9c61cb3994a3da97c31aed9b31f1aa1e1aa1a39f764be79aaeb4e53655983eddff5bcccb876605ed662b50bf04fe SHA512 2d8c1cf55e0d2d725aae4c3bd4f8300402b036e934218135ac840f9f891424458a79a9c2432bd4fa47255c30f096c3752a1a5897854f82da438398d5c671af23
+DIST cw-1.0.16.tar.bz2 76035 BLAKE2B 4257dad6df2122efabd9d5f51e7d0f0f5103afa261b4d7781ec27a81d9efc903c55a56e7b9bb1d16bb3c6bc856f15ec6f8d7ae69935511659bbfe82475377e38 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32
+EBUILD cw-1.0.16-r3.ebuild 1552 BLAKE2B 879d4516147ee9632c02bef1b8e00191eec2014cecd94b66b9c3a2dd3a75ac8745d300c40c87e14e3db87174ccc36732177f386b51c860b0442980a8de6ae0c7 SHA512 d298a475374013aad061c6555c14ec9b819ca34f24f2eb511951ea5ac4baf14a248e8235bcf5ee7904244f8fa6ef5b5211da16aaca0a305d8644ea51f0a87378
+MISC metadata.xml 343 BLAKE2B 809bbff73b5e90cb0c958b05b619ff6e6e00a72fb6c174a7d010e29a4f28a4c7a6d26cf2aca92b8b3cfc3604d6dca7fc592f857618a1b2e6c6cf038c30b55e66 SHA512 d0aa39ed1e7fe08244130357fe59579405e1f2d08675bf3979fc1d3944033da32f58926a5857e3a526417709af1351fb443f91657ce4e7b3da0aa8405a60b3a1
diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild
new file mode 100644
index 000000000000..5a667b143f95
--- /dev/null
+++ b/app-misc/cw/cw-1.0.16-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
+HOMEPAGE="http://cwrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-ldflags.patch \
+		"${FILESDIR}"/${PV}-path.patch \
+		"${FILESDIR}"/${PV}-collision.patch \
+		"${FILESDIR}"/${PV}-format-security.patch
+	tc-export CC
+}
+
+src_compile() {
+	emake local
+}
+
+src_install() {
+	insinto /usr/share/cw
+	doins etc/*
+
+	exeinto /usr/libexec/cw
+	doexe def/*
+
+	doman man/cwu*
+	newman man/cw.* color-wrapper
+	dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README*
+
+	dobin bin/{cwu,colorcfg}
+	# app-misc/color currently conflicts; hopefully 'colors' is safe
+	newbin bin/color colors
+	# media-radio/unixcw currently conflicts;
+	newbin bin/cw color-wrapper
+}
+
+pkg_postinst() {
+	ebegin "Updating definition files"
+	cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null
+	eend $?
+
+	elog "To enable color-wrapper, as your user, run:"
+	elog "  colorcfg [1|2|3]"
+	elog "to add relevant environment variables to your ~/.bash_profile"
+	elog "Run colorcfg without options to see what [1|2|3] means."
+	elog
+	elog "After sourcing your ~/.bash_profile, commands for which definitions"
+	elog "are provided should have colored output."
+	elog
+	elog "To enable/disable colored output, run: 'colors [on|off]'."
+}
diff --git a/app-misc/cw/files/1.0.16-collision.patch b/app-misc/cw/files/1.0.16-collision.patch
new file mode 100644
index 000000000000..52bb8cab8f3b
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-collision.patch
@@ -0,0 +1,34 @@
+diff --git a/src/cw.c b/src/cw.c
+index d7b4875..a7811d8 100644
+--- a/src/cw.c
++++ b/src/cw.c
+@@ -1336,7 +1336,7 @@ unsigned char is_cwfile(char *file){
+  s=strlen(buf);
+  if(buf[s]=='\n')s--;
+  if(buf[s]=='\r')s--;
+- if(s>4&&!strncmp(buf,"#!",2)&&!strncmp(buf+(s-4),"/cw",3))return(1);
++ if(s>15&&!strncmp(buf,"#!",2)&&!strncmp(buf+(s-15),"/color-wrapper",14))return(1);
+  return(0);
+ }
+ /* sets left and right borders. */
+diff --git a/src/cwu.c b/src/cwu.c
+index 823618d..63f566b 100644
+--- a/src/cwu.c
++++ b/src/cwu.c
+@@ -37,12 +37,12 @@ signed int main(signed int argc,char **argv){
+  if(argc>1&&!strcmp(argv[1],"-v"))
+   cwuexit(1,"cwu (color wrapper directive updater) v"VERSION);
+  if(argc<2)
+-  cwuexit(1,"syntax: cwu <definitions directory> <cw binary path>");
++  cwuexit(1,"syntax: cwu <definitions directory> <color-wrapper binary path>");
+  if(argc<3)cwuexit(1,"no path provided to update with.");
+- if(strncmp(argv[2]+(strlen(argv[2])-3),"/cw",3))
+-  cwuexit(1,"cw binary path doesn't end with `/cw'.");
++ if(strncmp(argv[2]+(strlen(argv[2])-14),"/color-wrapper",14))
++  cwuexit(1,"cw binary path doesn't end with `/color-wrapper'.");
+  if(access(argv[2],X_OK))
+-  cwuexit(1,"cw binary does not exist or is not executable.");
++  cwuexit(1,"color-wrapper binary does not exist or is not executable.");
+  globcw(argv[1],argv[2]);
+  cwuexit(0,0);
+  exit(0);
diff --git a/app-misc/cw/files/1.0.16-format-security.patch b/app-misc/cw/files/1.0.16-format-security.patch
new file mode 100644
index 000000000000..20f0b1d06b1e
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-format-security.patch
@@ -0,0 +1,16 @@
+ src/cw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cw.c b/src/cw.c
+index d7b4875..3ec1ac1 100644
+--- a/src/cw.c
++++ b/src/cw.c
+@@ -643,7 +643,7 @@ void sighandler(signed int sig){
+  else if(sig==SIGUSR1)ext=1;
+  else if(sig==SIGALRM)ext=2;
+  else if(sig==SIGPIPE||sig==SIGINT){
+-  fprintf(stderr,pal2[16]);
++  fprintf(stderr,"%s", pal2[16]);
+   fflush(stderr);
+   cwexit(0,0);
+  }
diff --git a/app-misc/cw/files/1.0.16-ldflags.patch b/app-misc/cw/files/1.0.16-ldflags.patch
new file mode 100644
index 000000000000..46037312c6c3
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-ldflags.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile.in b/Makefile.in
+index 9a6e4ec..e510493 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -19,11 +19,11 @@ all:
+ 
+ cw:
+ 	@$(ECHO) "* Compiling cw(color wrapper)..."
+-	@$(CC) src/cw.c -o bin/cw @CFLAGS@ @LIBS@ @DEFS@
++	$(CC) $(CFLAGS) $(LDFLAGS) src/cw.c -o bin/cw @CFLAGS@ @LIBS@ @DEFS@
+ 
+ cwu:
+ 	@$(ECHO) "* Compiling cwu(color wrapper directive updater)..."
+-	@$(CC) src/cwu.c -o bin/cwu @CFLAGS@
++	$(CC) $(CFLAGS) $(LDFLAGS) src/cwu.c -o bin/cwu
+ 
+ local: cw cwu
+ 
diff --git a/app-misc/cw/files/1.0.16-path.patch b/app-misc/cw/files/1.0.16-path.patch
new file mode 100644
index 000000000000..f62b5bd994d4
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-path.patch
@@ -0,0 +1,19 @@
+diff --git a/bin/colorcfg b/bin/colorcfg
+index cf73b50..3e78c73 100755
+--- a/bin/colorcfg
++++ b/bin/colorcfg
+@@ -10,13 +10,7 @@ echo "[ cw/color wrapper: user setup script. ]"
+ if test -x "${HOME}/.cw/bin/colorcfg";then
+  CWLIB="${HOME}/.cw/def"
+ else
+- SED="`which sed 2>/dev/null`"
+- if test -z "$SED";then
+-  CWLIB="/usr/local/lib/cw"
+-  echo "(NOTE: using static cw library path, this could be invalid)"
+- else
+-  CWLIB="`echo \"$0/lib/cw\"|sed \"s/\/bin\/colorcfg//g\"`"
+- fi
++  CWLIB="/usr/libexec/cw"
+ fi
+ 
+ echo "[ cw library path: $CWLIB ]"
diff --git a/app-misc/cw/metadata.xml b/app-misc/cw/metadata.xml
new file mode 100644
index 000000000000..e5ef85998d9b
--- /dev/null
+++ b/app-misc/cw/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cwrapper</remote-id>
+	</upstream>
+</pkgmetadata>