From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- dev-lang/maude/files/maude-2.5.0-prll.patch | 24 ++++++++++++++ dev-lang/maude/files/maude-2.6-gcc47.patch | 25 +++++++++++++++ .../maude/files/maude-2.6-search-datadir.patch | 37 ++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 dev-lang/maude/files/maude-2.5.0-prll.patch create mode 100644 dev-lang/maude/files/maude-2.6-gcc47.patch create mode 100644 dev-lang/maude/files/maude-2.6-search-datadir.patch (limited to 'dev-lang/maude/files') diff --git a/dev-lang/maude/files/maude-2.5.0-prll.patch b/dev-lang/maude/files/maude-2.5.0-prll.patch new file mode 100644 index 000000000000..5499af3eb764 --- /dev/null +++ b/dev-lang/maude/files/maude-2.5.0-prll.patch @@ -0,0 +1,24 @@ +diff --git a/src/Mixfix/Makefile.am b/src/Mixfix/Makefile.am +index d811631..295f0c6 100644 +--- a/src/Mixfix/Makefile.am ++++ b/src/Mixfix/Makefile.am +@@ -72,7 +72,7 @@ libmixfix_a_SOURCES = \ + EXTRA_libmixfix_a_SOURCES = \ + compiler.cc + +-BUILT_SOURCES = surface.yy surface.cc surface.h lexer.cc ++BUILT_SOURCES = surface.cc lexer.cc + CLEANFILES = surface.yy surface.cc surface.h lexer.cc + + surface.yy: \ +@@ -87,7 +87,9 @@ surface.yy: \ + $(srcdir)/bottom.yy \ + > surface.yy + +-surface.cc surface.h: surface.yy ++surface.h: surface.yy ++ ++surface.cc: surface.h + $(BISON) -dv surface.yy -o surface.c + mv surface.c surface.cc + diff --git a/dev-lang/maude/files/maude-2.6-gcc47.patch b/dev-lang/maude/files/maude-2.6-gcc47.patch new file mode 100644 index 000000000000..65dcc302ab33 --- /dev/null +++ b/dev-lang/maude/files/maude-2.6-gcc47.patch @@ -0,0 +1,25 @@ +Get maude to compile on amd64 with g++ 4.7 +bicatali@gentoo.org nov 2013 + +--- Maude-2.6.orig/src/Mixfix/lexerAux.cc 2013-11-06 09:41:00.821049550 -0800 ++++ Maude-2.6/src/Mixfix/lexerAux.cc 2013-11-06 09:41:33.174247429 -0800 +@@ -35,7 +35,7 @@ + bool fakeNewlineStack[MAX_IN_DEPTH]; + + void +-getInput(char* buf, int& result, int max_size) ++getInput(char* buf, size_t& result, int max_size) + { + result = YY_NULL; + if (UserLevelRewritingContext::interrupted()) +--- Maude-2.6.orig/src/Mixfix/lexerAux.hh 2013-11-06 09:41:00.821049550 -0800 ++++ Maude-2.6/src/Mixfix/lexerAux.hh 2013-11-06 09:41:23.466187406 -0800 +@@ -27,7 +27,7 @@ + //extern int inStackPtr; + //extern YY_BUFFER_STATE inStack[]; + +-void getInput(char* buf, int& result, int max_size); ++void getInput(char* buf, size_t& result, int max_size); + void lexerIdMode(); + void lexerTokenTreeMode(int terminatingTokens); + void lexerCmdMode(); diff --git a/dev-lang/maude/files/maude-2.6-search-datadir.patch b/dev-lang/maude/files/maude-2.6-search-datadir.patch new file mode 100644 index 000000000000..f5522eda2a05 --- /dev/null +++ b/dev-lang/maude/files/maude-2.6-search-datadir.patch @@ -0,0 +1,37 @@ +Have maude search in datadir for its files. +--- a/src/Main/main.cc ++++ b/src/Main/main.cc +@@ -263,6 +263,11 @@ + { + if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK)) + return true; ++ if (directoryManager.checkAccess(DATADIR, fileName, R_OK)) ++ { ++ directory = DATADIR; ++ return true; ++ } + if (!(executableDirectory.empty()) && + directoryManager.checkAccess(executableDirectory, fileName, R_OK)) + { +--- a/src/Mixfix/global.cc ++++ b/src/Mixfix/global.cc +@@ -83,6 +83,9 @@ + return true; + if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK, ext)) + return true; ++ directory = DATADIR; ++ if (directoryManager.checkAccess(directory, fileName, R_OK, ext)) ++ return true; + if (!(executableDirectory.empty()) && + directoryManager.checkAccess(executableDirectory, fileName, R_OK, ext)) + { +--- a/src/Mixfix/global.hh ++++ b/src/Mixfix/global.hh +@@ -36,6 +36,7 @@ + + #define PRELUDE_NAME "prelude.maude" + #define MAUDE_LIB "MAUDE_LIB" ++#define DATADIR "/usr/share/maude" + + bool + findPrelude(string& directory, string& fileName); -- cgit v1.2.3-65-gdbad