diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-misc/getopt/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-misc/getopt/files')
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.4-irix.patch | 17 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.4-libintl.patch | 34 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.4-longrename.patch | 118 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.5-libintl.patch | 11 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.5-longrename.patch | 79 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.5-setlocale.patch | 12 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.6-longrename.patch | 70 |
7 files changed, 341 insertions, 0 deletions
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 <unistd.h> + #endif /* GNU C library. */ + +-#ifdef VMS +-#include <unixlib.h> +-#if HAVE_STRING_H - 0 + #include <string.h> +-#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.4-libintl.patch b/app-misc/getopt/files/getopt-1.1.4-libintl.patch new file mode 100644 index 000000000000..232e487b3d31 --- /dev/null +++ b/app-misc/getopt/files/getopt-1.1.4-libintl.patch @@ -0,0 +1,34 @@ +Index: getopt-1.1.4/Makefile +=================================================================== +--- getopt-1.1.4.orig/Makefile ++++ getopt-1.1.4/Makefile +@@ -33,7 +33,10 @@ MSGFMT=msgfmt + LANGUAGES = cs de es fr it ja nl pt_BR + MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES)) + +-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX ++CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX ++ifeq ($(WITHOUT_GETTEXT),1) ++CPPFLAGS+=-DWITHOUT_GETTEXT ++endif + ifeq ($(LIBCGETOPT),0) + CPPFLAGS+=-I./gnu + endif +@@ -62,7 +65,7 @@ clean: clean_po + -$(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) +@@ -75,7 +78,7 @@ install_doc: + getopt-test.bash getopt-test.tcsh \ + $(DESTDIR)$(getoptdir) + +-ifeq ($(WITH_GETTEXT),1) ++ifeq ($(WITHOUT_GETTEXT),0) + all_po: $(MOFILES) + install_po: all_po + $(INSTALL) -m 755 -d $(DESTDIR)$(localedir) diff --git a/app-misc/getopt/files/getopt-1.1.4-longrename.patch b/app-misc/getopt/files/getopt-1.1.4-longrename.patch new file mode 100644 index 000000000000..dc3ecb066378 --- /dev/null +++ b/app-misc/getopt/files/getopt-1.1.4-longrename.patch @@ -0,0 +1,118 @@ +Index: getopt-1.1.4/getopt.c +=================================================================== +--- getopt-1.1.4.orig/getopt.c ++++ getopt-1.1.4/getopt.c +@@ -88,7 +88,7 @@ void *our_malloc(size_t size) + { + void *ret=malloc(size); + if (! ret) { +- fprintf(stderr,_("%s: Out of memory!\n"),"getopt"); ++ fprintf(stderr,_("%s: Out of memory!\n"),"getopt-long"); + exit(3); + } + return(ret); +@@ -98,7 +98,7 @@ void *our_realloc(void *ptr, size_t size + { + void *ret=realloc(ptr,size); + if (! ret && size) { +- fprintf(stderr,_("%s: Out of memory!\n"),"getopt"); ++ fprintf(stderr,_("%s: Out of memory!\n"),"getopt-long"); + exit(3); + } + return(ret); +@@ -231,8 +231,8 @@ int generate_output(char * argv[],int ar + void parse_error(const char *message) + { + if (message) +- fprintf(stderr,"getopt: %s\n",message); +- fputs(_("Try `getopt --help' for more information.\n"),stderr); ++ fprintf(stderr,"getopt-long: %s\n",message); ++ fputs(_("Try `getopt-long --help' for more information.\n"),stderr); + exit(2); + } + +@@ -323,10 +323,10 @@ void set_shell(const char *new_shell) + + void print_help(void) + { +- fputs(_("Usage: getopt optstring parameters\n"),stderr); +- fputs(_(" getopt [options] [--] optstring parameters\n"),stderr); +- fputs(_(" getopt [options] -o|--options optstring [options] [--]\n"),stderr); +- fputs(_(" parameters\n"),stderr); ++ fputs(_("Usage: getopt-long optstring parameters\n"),stderr); ++ fputs(_(" getopt-long [options] [--] optstring parameters\n"),stderr); ++ fputs(_(" getopt-long [options] -o|--options optstring [options] [--]\n"),stderr); ++ fputs(_(" parameters\n"),stderr); + fputs(_(" -a, --alternative Allow long options starting with single -\n"),stderr); + fputs(_(" -h, --help This small usage guide\n"),stderr); + fputs(_(" -l, --longoptions=longopts Long options to be recognized\n"),stderr); +@@ -335,7 +335,7 @@ void 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, --unqote Do not quote the output\n"),stderr); + fputs(_(" -V, --version Output version information\n"),stderr); + exit(2); +@@ -443,7 +443,7 @@ int main(int argc, char *argv[]) + quote=0; + break; + case 'V': +- printf(_("getopt (enhanced) 1.1.4\n")); ++ printf(_("getopt-long (enhanced) 1.1.4\n")); + exit(0); + case '?': + case ':': +Index: getopt-1.1.4/getopt-parse.bash +=================================================================== +--- getopt-1.1.4.orig/getopt-parse.bash ++++ getopt-1.1.4/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 +Index: getopt-1.1.4/getopt-parse.tcsh +=================================================================== +--- getopt-1.1.4.orig/getopt-parse.tcsh ++++ getopt-1.1.4/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 +Index: getopt-1.1.4/Makefile +=================================================================== +--- getopt-1.1.4.orig/Makefile ++++ getopt-1.1.4/Makefile +@@ -85,7 +85,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) +Index: getopt-1.1.4/nls.h +=================================================================== +--- getopt-1.1.4.orig/nls.h ++++ getopt-1.1.4/nls.h +@@ -29,7 +29,7 @@ + #ifndef GETOPT_NLS + #define GETOPT_NLS + +-#define PACKAGE "getopt" ++#define PACKAGE "getopt-long" + + #ifndef WITHOUT_GETTEXT + #include <libintl.h> 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-longrename.patch b/app-misc/getopt/files/getopt-1.1.5-longrename.patch new file mode 100644 index 000000000000..03f2ca5a7445 --- /dev/null +++ b/app-misc/getopt/files/getopt-1.1.5-longrename.patch @@ -0,0 +1,79 @@ +--- getopt-1.1.5/getopt-parse.bash ++++ getopt-1.1.5/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 +--- getopt-1.1.5/getopt-parse.tcsh ++++ getopt-1.1.5/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 +--- getopt-1.1.5/getopt.c ++++ getopt-1.1.5/getopt.c +@@ -320,10 +320,10 @@ + + static void __attribute__ ((__noreturn__)) print_help(void) + { +- fputs(_("Usage: getopt optstring parameters\n"), stderr); +- fputs(_(" getopt [options] [--] optstring parameters\n"), stderr); +- fputs(_(" getopt [options] -o|--options optstring [options] [--]\n"), stderr); +- fputs(_(" parameters\n"), stderr); ++ fputs(_("Usage: getopt-long optstring parameters\n"), stderr); ++ fputs(_(" getopt-long [options] [--] optstring parameters\n"), stderr); ++ fputs(_(" getopt-long [options] -o|--options optstring [options] [--]\n"), stderr); ++ fputs(_(" parameters\n"), stderr); + fputs(_("\nOptions:\n"), stderr); + fputs(_(" -a, --alternative Allow long options starting with single -\n"), stderr); + fputs(_(" -h, --help This small usage guide\n"), stderr); +@@ -333,7 +333,7 @@ + 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, --unquote Do not quote the output\n"), stderr); + fputs(_(" -V, --version Output version information\n"), stderr); + fputc('\n', stderr); +--- getopt-1.1.5/Makefile ++++ getopt-1.1.5/Makefile +@@ -32,7 +32,7 @@ + LANGUAGES = ca cs da de es et eu fi fr gl 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 @@ + 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) +--- getopt-1.1.5/nls.h ++++ getopt-1.1.5/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/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 <locale.h> + #include <libintl.h> + #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 <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) |