Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 160 insertions, 7 deletions

diff --git a/app-misc/getopt/ChangeLog b/app-misc/getopt/ChangeLog
index bdd8f7963799..c9833e6671d7 100644
--- a/app-misc/getopt/ChangeLog
+++ b/app-misc/getopt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/getopt
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.11 2014/07/10 12:18:05 haubi Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.12 2015/02/16 05:47:15 vapier Exp $
+
+*getopt-1.1.6 (16 Feb 2015)
+
+  16 Feb 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/getopt-1.1.6-longrename.patch, +getopt-1.1.6.ebuild:
+  Version bump.
 
   10 Jul 2014; Michael Haubenwallner <haubi@gentoo.org> getopt-1.1.5.ebuild:
   add ~ppc-aix keyword
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index 2da8c147c5bc..7e2781cf9312 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -7,16 +7,29 @@ AUX getopt-1.1.4-longrename.patch 4825 SHA256 c6331d44293dc315251ab3014f039456bf
 AUX getopt-1.1.5-libintl.patch 353 SHA256 b4a0857bae22fe85f8dbc3741d190ed1b258719257d0f6824298c3febd6cae3e SHA512 eca001588a940f5bc50f95c0f93fc352f5dc647325a5b1ff0c7ddf0bf93e2c8fd2ac4f735c0ae5d48e4c9b2c54799e6d6028a5602147a3b9a28dc5e65e66f5ec WHIRLPOOL 6935d95391ef80e9ff6c4404b339e8cf84ac4dccf9caa8de4555ec5d6f6e7544ae045aa0ec45450d2e65cd528bb753ff40e9dd4f36c28b82ace817b6a1132ee9
 AUX getopt-1.1.5-longrename.patch 3763 SHA256 592cd45a9ac17fb0e0092cbe75580d75e4f06408693a814460129df5682ac7d8 SHA512 4c74684ed6ac90d89a8d100a32456985f544a6440924f503f732e3391d652485b637307a40849103d45781a197d077ab44fd9d63f371cdabfc34ae5cc4396987 WHIRLPOOL a9725839149b0938c9ec03942638043672ac2e162b40fc3b9dcd214a92a21f1275cccb42de2d104161255332954b5a5e31cad7b9eff3f14aeda25b6d6bcb3498
 AUX getopt-1.1.5-setlocale.patch 323 SHA256 2c2ad7608d15efc31581ee4f3c0064c0d93748539f9914cc2f081b0d80b6c2e7 SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e WHIRLPOOL 44b8364a0a7136bc12b30d7ea7474e13f9f5935f678a7205ecac873a0b34a7d3dcf9a8ea8e4b63ba869f533a75111cbdc9b5cb3c7769a7b295e35c7d54f5fd23
+AUX getopt-1.1.6-longrename.patch 3013 SHA256 6961d19e4e4ab3e38efec06d70a95ae95a2cbabb925b841ab442e48a32dfe2ca SHA512 7157f9bd2bc660519972898bd24f0f04f01196a54c44a3a3ba4b0fda0acfb9b13cabba7cfbd1e784e9f5b3c94f2955325f47933e5d6affcb1a0f740d933206b9 WHIRLPOOL cefd7ff5ce98064c044a23d0231bc92a52d3e5ac3bc048725f6c7d757407e19b13732fce23e0b937d8618c298b4dd1148fc978c39d27e6ac94a1b09a61fe6ecd
 DIST getopt-1.1.4.tar.gz 37163 SHA256 41083d9993c26792851e79b81a0991996a3f61e14998fdd607615cc3bf933bab SHA512 9ec9b5ca50a02b6ae772b133408e61fb9fcb5840c00f23d1c836a9c7ee86778211dcb1ecf5cdcaf9e2488b2db0671e29bc8be55f1a7ca4f1d48cc3921dfe04ad WHIRLPOOL 64e4942064930303ecc8cd6ea22f93ccd0c34415815f1e4fc43d2786b1e3bd511fac6d0aa6ef470b0a026a7776c4e0b345b1beada0c972203808232d0c331727
 DIST getopt-1.1.5.tar.gz 51794 SHA256 11893276b94b1629606ab75772143918a5713259950fbf4216288e246f19fbb6 SHA512 43597a1a8dd1dc188b6b4f0a8f8d438456013276aa1c719889e242ba2b526dccbca2fccd3d82d1541f4e0920fd277c101a436ed0c208124227481f792cb1cf75 WHIRLPOOL c5de1797b0c294a404ef8e801d86677d0b84fd6974e5d5ad8d234ae28db5446d0b13766362ecac459b3f8ce07d56282a3f0274b460d5d95118000762d9374815
+DIST getopt-1.1.6.tar.gz 58926 SHA256 d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10 WHIRLPOOL 0fa96415fa5d9b001313b1491a0f260922dbb52ac72d6242e6ff332ac802e3d6cac2401c8e8a8f9cc09376d3c51f4b1cc3bd0f976dc857cd72c1ffc7b1d770da
 EBUILD getopt-1.1.4.ebuild 1831 SHA256 dc7d6fb1bafb9ed23184cffa56c5a7628c2407f583522648d19f909024505a20 SHA512 f2d892f5369221954b6ea001d50da85ba7ce688975a7425288d51111a44590c68872521443f42cdcdf839f3e6142579b5c385919616be15fc13b6ad2af858803 WHIRLPOOL 4a7ac1753a1d0401abac88e8de3af9f9fcfcd0cf31ba172640c001e342cd1065223f6cbf54dcf30a59019f6cf46c3a6d787e414a40a9a523652305068dc397d1
 EBUILD getopt-1.1.5.ebuild 1900 SHA256 dda9a2f04f4f0c5819f56be9ca7cc1abc3fd87c40e61ecd8dc7bb9365a2cf22d SHA512 29bea063f65bf1270d1a8bb6502ba6165778ffc7478652deba5e8d9035619eefd4bb050e2b5ecd10750dcd31c1882f1c03915a85f2ed53543af458a8ecbe894d WHIRLPOOL 2a58a9729cacf4d58ae7c82d5eb0d028316b082bd75bd236fc940cc0d444a257a5940aa6a22c01126354f0b5c422c670ca0bd5ebd658dc6523d0282a85c7af91
-MISC ChangeLog 1866 SHA256 f5c85b6d67fadf7f75e0dc6e73d67776ec1056f2986cf4b34ac3e0e55d6b76e3 SHA512 cc969184b9b3d033aa36bb15c2a844bf5189157b49b13b783a38816fac7a9b3031c5c5add52fc3467da20f096a9a8d5ff6f674cf067bb0b4f86cec11cedcb497 WHIRLPOOL 5d6b20bea6c0ec3ac2399cf1651e244731b8b798f2a3f9964bb4f222c1304f73355e8f1804ef00293dcf526777fdd8bec8f7465cdcda8a97e584cf2431a132c8
+EBUILD getopt-1.1.6.ebuild 1912 SHA256 6d20760d5cb97bc7f6872e36ac7190b977b5411706ab497eea6a2182cde48547 SHA512 9b86bf4be5ec4c78af61d41c87570fab44c541022f58fb56a81bb90464a93c57e52219f194f245cbe6debb5e9bbd1a91767d52631a54be484e70cf17be9a24ee WHIRLPOOL 6ccfd0f3aba0d0d8ff73ed074430c587df41716f86ea09c4158bc767a842047daee694509121ac645eee4887a742e922adc6da96ba8b5d74ebac13834cfc05d8
+MISC ChangeLog 2025 SHA256 8e6e0287e66750a6cf1fdf5db41d400ef9ed2e9b6767e769ca9c3bfdd41d0068 SHA512 678f6a49d503df74040c4d5fc94b5bc120b73c6033b7cc8911a8addd6a32b5e755f07c5ff7c417a5709668a1e649fc3ffc7ca68f7b602ba00abdafb40d0233c7 WHIRLPOOL 2a544be9a0696ed1dd1c56c09f0e9ea7f74b4db1c2479161dd702f5f1c51801f653596ab3dd975c6f0e567da36a72c8b880f9c74b0a21b02b22dc9ac110fce8e
 MISC metadata.xml 176 SHA256 8e6c74feaa809489155bb0291854a8754da6d7c277f1189330845c33afd71371 SHA512 ce52e0ff5336ca9413757a79f1e13c63bdf58a02c2f823bfe24b504232487d70930fd9f9034f2b7f62d67aae71fc06805b6ea46cd2b098bb915a3c1594cfdd03 WHIRLPOOL e123b78e40c2f596efba9cb1378fb6f9f75f1bfadf4daedb7bec493f2c154075480f3e3394f1b230b6d22346ef8fba5e0db9a0ed783fbcc396599fd2b4b3696d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlO+hGAACgkQLc0TWKYwzLhiBQCgjWh1JPi2Eu7BsAC6UM8m9B6s
-TPoAoIuwREyGMw5BGk6SN1+GJhG9I4ju
-=gESw
+iQIcBAEBCAAGBQJU4YT5AAoJEPGu1DbS6WIAgckQAJvAQsUNC8eiBgae2LRW0Oc+
+r3Sm/1dLMYToLPKUoUsgD22vfsT3e/gPBmcNmdt8IB9fz7PEk2fUzR77J9ur8DLi
+b1ac03N/ywKlyuNEP2wS/6kZItspsrjleOV6e1WUE974zPmcuuQCv35vnntFN6JM
+ya6VO1F486qI0q47ulg+JwuKteaazpD+Sdq8pxyikaiCAStF1iekF29kwkxDxXiV
+Ah27PPp4P3zU9R0Sb+cqq5bk31raUa+6axbANAMcfzQzxgiXdBgcx/W98uEL2y0+
+GqLfmUbHdu9110zGWQfMdlA57Jee7ZWiEoiwkcR0qKzrInaqTvfktzMi38I5K+pc
+fCCAu88+eRo3tX8HweNGV/ZRUxi0GRWJiAmrjan/KGUA+5lskHqZPyQAoJef4KsC
+cCJiE1xRLjBwdbLLW9cu4pQYX6hRimc4RVQdBNWFyike3XzACR+bI2duzhytwTCr
+eSPwHTpwrp/t5b3vh8puwGwE0pfhlcdq7yzPQjTNc2pL7RjzznILTRLDho5Wvdya
+f7epndAH5m5JohgdKibNgyteKZhGHZp+NfMJWkFUlU1JCB8OEy84p96qzIhrA4z/
+v4P1yjWb8MjlUh0f8riK6MTqELdCiPBgrK56xSHe6juAsDznd2Bf/7lnIWRvoVWF
+mX7cM5QZzgjeaSUbddaJ
+=Ni39
 -----END PGP SIGNATURE-----
diff --git a/app-misc/getopt/files/getopt-1.1.6-longrename.patch b/app-misc/getopt/files/getopt-1.1.6-longrename.patch
new file mode 100644
index 000000000000..f2b4ba79a090
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.6-longrename.patch
@@ -0,0 +1,70 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,7 +32,7 @@ MSGFMT=msgfmt
+ LANGUAGES = ca cs da de es et eu fi fr gl hr hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
+ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
+ 
+-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\"  -Dprogram_version=\"$(VERSION)\"
++CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)-long\"  -Dprogram_version=\"$(VERSION)\"
+ ifeq ($(LIBCGETOPT),0)
+ CPPFLAGS+=-I./gnu 
+ endif
+@@ -81,7 +81,7 @@ install_po: all_po
+ 	for lang in $(LANGUAGES) ; do \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(INSTALL) -m 755 -d $(DESTDIR)$$dir ;\
+-	  $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt.mo  ;\
++	  $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt-long.mo  ;\
+ 	done
+ clean_po:
+ 	$(RM) $(MOFILES)
+--- a/getopt-parse.bash
++++ b/getopt-parse.bash
+@@ -19,7 +19,7 @@
+ # Note that we use `"$@"' to let each command-line parameter expand to a 
+ # separate word. The quotes around `$@' are essential!
+ # We need TEMP as the `eval set --' would nuke the return value of getopt.
+-TEMP=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \
++TEMP=`getopt-long -o ab:c:: --long a-long,b-long:,c-long:: \
+      -n 'example.bash' -- "$@"`
+ 
+ if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+--- a/getopt-parse.tcsh
++++ b/getopt-parse.tcsh
+@@ -26,7 +26,7 @@
+ # as a list. The ':q`  copies that list without doing any substitutions:
+ # each element of argv becomes a separate argument for getopt. The braces
+ # are needed because the result is also a list.
+-set temp=(`getopt -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`)
++set temp=(`getopt-long -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`)
+ if ($? != 0) then 
+   echo "Terminating..." >/dev/stderr
+   exit 1
+--- a/getopt.c
++++ b/getopt.c
+@@ -344,12 +344,12 @@ static void __attribute__ ((__noreturn__)) print_help(void)
+ 	fputs(_(" -q, --quiet                  Disable error reporting by getopt(3)\n"), stderr);
+ 	fputs(_(" -Q, --quiet-output           No normal output\n"), stderr);
+ 	fputs(_(" -s, --shell <shell>          Set shell quoting conventions\n"), stderr);
+-	fputs(_(" -T, --test                   Test for getopt(1) version\n"), stderr);
++	fputs(_(" -T, --test                   Test for getopt-long(1) version\n"), stderr);
+ 	fputs(_(" -u, --unquoted               Do not quote the output\n"), stderr);
+ 	fputs(USAGE_SEPARATOR, stderr);
+ 	fputs(USAGE_HELP, stderr);
+ 	fputs(USAGE_VERSION, stderr);
+-	fprintf(stderr, USAGE_MAN_TAIL("getopt(1)"));
++	fprintf(stderr, USAGE_MAN_TAIL("getopt-long(1)"));
+ 	exit(PARAMETER_EXIT_CODE);
+ }
+ 
+--- a/nls.h
++++ b/nls.h
+@@ -29,7 +29,7 @@
+ #ifndef GETOPT_NLS
+ #define GETOPT_NLS
+ 
+-#define PACKAGE "getopt"
++#define PACKAGE "getopt-long"
+ 
+ #if WITHOUT_GETTEXT
+ #define _(Text) (Text)
diff --git a/app-misc/getopt/getopt-1.1.6.ebuild b/app-misc/getopt/getopt-1.1.6.ebuild
new file mode 100644
index 000000000000..b6b2fb858185
--- /dev/null
+++ b/app-misc/getopt/getopt-1.1.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.6.ebuild,v 1.1 2015/02/16 05:47:15 vapier Exp $
+
+EAPI=4
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="getopt(1) replacement supporting GNU-style long options"
+HOMEPAGE="http://software.frodo.looijaard.name/getopt/"
+SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.5-libintl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.5-setlocale.patch
+	epatch "${FILESDIR}"/${PN}-1.1.6-longrename.patch
+
+	# hopefully this is portable enough
+	epatch "${FILESDIR}"/${PN}-1.1.4-irix.patch
+}
+
+src_compile() {
+	local nogettext="1"
+	local libintl=""
+	local libcgetopt=1
+
+	if use nls; then
+		nogettext=0
+		has_version sys-libs/glibc || libintl="-lintl"
+	fi
+
+	[[ ${CHOST} == *-irix* ]] && libcgetopt=0
+	[[ ${CHOST} == *-interix* ]] && libcgetopt=0
+
+	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" \
+		LIBCGETOPT=${libcgetopt} \
+		WITHOUT_GETTEXT=${nogettext} LIBINTL=${libintl} \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	use nls && emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install_po
+
+	newbin getopt getopt-long
+
+	# at least on interix, the system getopt is ... broken...
+	# util-linux, which would provide the getopt binary, does not build &
+	# install on interix/prefix, so, this has to provide it.
+	[[ ${CHOST} == *-interix* || ${CHOST} == *-mint* ]] && \
+		dosym getopt-long /usr/bin/getopt
+
+	newman getopt.1 getopt-long.1
+
+	dodoc getopt-*sh
+}