From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-misc/getopt/Manifest | 9 +++ app-misc/getopt/files/getopt-1.1.4-irix.patch | 17 ++++++ app-misc/getopt/files/getopt-1.1.5-libintl.patch | 11 ++++ app-misc/getopt/files/getopt-1.1.5-setlocale.patch | 12 ++++ .../getopt/files/getopt-1.1.6-longrename.patch | 70 ++++++++++++++++++++++ app-misc/getopt/getopt-1.1.6.ebuild | 64 ++++++++++++++++++++ app-misc/getopt/metadata.xml | 12 ++++ 7 files changed, 195 insertions(+) create mode 100644 app-misc/getopt/Manifest create mode 100644 app-misc/getopt/files/getopt-1.1.4-irix.patch create mode 100644 app-misc/getopt/files/getopt-1.1.5-libintl.patch create mode 100644 app-misc/getopt/files/getopt-1.1.5-setlocale.patch create mode 100644 app-misc/getopt/files/getopt-1.1.6-longrename.patch create mode 100644 app-misc/getopt/getopt-1.1.6.ebuild create mode 100644 app-misc/getopt/metadata.xml (limited to 'app-misc/getopt') diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest new file mode 100644 index 000000000000..90219d71ac00 --- /dev/null +++ b/app-misc/getopt/Manifest @@ -0,0 +1,9 @@ +AUX getopt-1.1.4-irix.patch 357 SHA256 2562a5585f5bc0b4dbe945cbecd94975839b135e4c1ec36069104394febd1061 SHA512 001949835eafe86d5f1f9dfef9892ebbf6b1c5a3d870cf57c4ac7543c048c061429c8f7cb754260ff16e2694bb497ed89c0d4e746f1c7064883a55940563dd92 WHIRLPOOL 9050b02b5e28cf79ffc5a35cf08b6b38bd9d417fbb4494314f8196a338fca118286bf6be554d37e9be7296caad71edd96e4fab4cfcec3a83cea489dc0433bfb3 +AUX getopt-1.1.5-libintl.patch 353 SHA256 b4a0857bae22fe85f8dbc3741d190ed1b258719257d0f6824298c3febd6cae3e SHA512 eca001588a940f5bc50f95c0f93fc352f5dc647325a5b1ff0c7ddf0bf93e2c8fd2ac4f735c0ae5d48e4c9b2c54799e6d6028a5602147a3b9a28dc5e65e66f5ec WHIRLPOOL 6935d95391ef80e9ff6c4404b339e8cf84ac4dccf9caa8de4555ec5d6f6e7544ae045aa0ec45450d2e65cd528bb753ff40e9dd4f36c28b82ace817b6a1132ee9 +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.6.tar.gz 58926 SHA256 d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10 WHIRLPOOL 0fa96415fa5d9b001313b1491a0f260922dbb52ac72d6242e6ff332ac802e3d6cac2401c8e8a8f9cc09376d3c51f4b1cc3bd0f976dc857cd72c1ffc7b1d770da +EBUILD getopt-1.1.6.ebuild 1817 SHA256 1dbdf201b9b849a86ef5802d29fd5adc90acbfb4aa77094939af63a7c8564751 SHA512 34e003fa1048eb95b78503398684056dd2012d2a6cb69bba375bab13d780000df1951710cb59a62ecf8f278f2a4c8e3ed81974bcbfb2c9a238221731f00a585b WHIRLPOOL 6a1e26fa7d3aea76f8d3407e27b5a7b608a9fb30b9979b6377e9726899dc453d95345daffc64e94fc20c1b4d7f59c8490db87d7fe9cc161375947f9f869b3cb0 +MISC ChangeLog 3180 SHA256 07e48c76b7e16aa6f01caa5f107220427e372432b9736da87676e0baf9ff9a23 SHA512 0de809fb18dfc4acb312a41592334b177c3259dd4ca6fe7df93ecb52e99f918dcff9d1d55d9dd441e87468987e1782cbc514941c31730b3a769a7d9a1a5aa065 WHIRLPOOL a0035044a3ce30df112c7ad5f2ae63430fb1256c5770aa6da78d85a5c01eebec13f85ce1ab21985deed49356560bc3ce7b9b7c4a79fd3911627d239b19cafbed +MISC ChangeLog-2015 2126 SHA256 9899303843088c92a3c7f77c2239ae182d3374480b33de6519205d4562cdc5e8 SHA512 a892e46ebc192ebada77422754782d93cfdf83f26eaa3a5099cdbd84838477f19c572fb9adff4190370252ead6f7e7759c31768ca899d95b15335a4b739961d2 WHIRLPOOL 66d6214df3ae307488afb89712a4dfd4af4bde53012bed1dfb973834ccf8093d470b0739944531c680cfd16aa7ed52bd2411c88ca12155ee5b9fc095e1f08be1 +MISC metadata.xml 342 SHA256 a531bbd7b7392ccef2501efd65d6a3fd825d9b8c53dd67226e6dfbe4594d821c SHA512 90fdb073ca1dcd23506cb421440ec9719517f4bbb6839f5944898a3368bd01aba189346c26a27928a777ef59b22256ea5046ed9180b5b2ff034afbc7b4374b05 WHIRLPOOL 055034ebe7354bf25233bc8effb9e8e7e52c17a14c86108ab915b089ddb7abfb0f0f0f2fc838fa4868671b6f8ff9834caf6ef0ed31329d7bca3905b031e26873 diff --git a/app-misc/getopt/files/getopt-1.1.4-irix.patch b/app-misc/getopt/files/getopt-1.1.4-irix.patch new file mode 100644 index 000000000000..0c344a80131a --- /dev/null +++ b/app-misc/getopt/files/getopt-1.1.4-irix.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/show_bug.cgi?id=211499 + +--- gnu/getopt.c.dist ++++ gnu/getopt.c +@@ -69,12 +69,7 @@ + #include + #endif /* GNU C library. */ + +-#ifdef VMS +-#include +-#if HAVE_STRING_H - 0 + #include +-#endif +-#endif + + #if defined (WIN32) && !defined (__CYGWIN32__) + /* It's not Unix, really. See? Capital letters. */ diff --git a/app-misc/getopt/files/getopt-1.1.5-libintl.patch b/app-misc/getopt/files/getopt-1.1.5-libintl.patch new file mode 100644 index 000000000000..b40367105ed0 --- /dev/null +++ b/app-misc/getopt/files/getopt-1.1.5-libintl.patch @@ -0,0 +1,11 @@ +--- Makefile.orig 2012-12-28 11:40:09.524686698 +0100 ++++ Makefile 2012-12-28 11:41:20.646157275 +0100 +@@ -61,7 +61,7 @@ + -$(RM) $(objects) $(binaries) + + getopt: $(objects) +- $(CC) $(LDFLAGS) -o $@ $(objects) ++ $(CC) $(LDFLAGS) -o $@ $(objects) $(LIBINTL) + + install: getopt install_po + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) diff --git a/app-misc/getopt/files/getopt-1.1.5-setlocale.patch b/app-misc/getopt/files/getopt-1.1.5-setlocale.patch new file mode 100644 index 000000000000..2d302d9c6a67 --- /dev/null +++ b/app-misc/getopt/files/getopt-1.1.5-setlocale.patch @@ -0,0 +1,12 @@ +setlocale: we need locale.h for LC_ALL on OpenIndiana + +--- getopt-1.1.5/nls.h ++++ getopt-1.1.5/nls.h +@@ -40,6 +40,7 @@ + #undef setlocale + #define setlocale(Category,Locale) /* empty */ + #else /* not WITHOUT_GETTEXT */ ++#include + #include + #define _(Text) gettext (Text) + #endif /* WITHOUT_GETTEXT */ 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 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..4203c9fb6e90 --- /dev/null +++ b/app-misc/getopt/getopt-1.1.6.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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} == *-aix* ]] && libcgetopt=0 + [[ ${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 +} diff --git a/app-misc/getopt/metadata.xml b/app-misc/getopt/metadata.xml new file mode 100644 index 000000000000..b7214d2c696f --- /dev/null +++ b/app-misc/getopt/metadata.xml @@ -0,0 +1,12 @@ + + + + + bsd@gentoo.org + BSD Project + + + prefix@gentoo.org + Gentoo Prefix + + -- cgit v1.2.3