commit: 19541888b65d7372cf549224dafbfe6336392e96 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Jan 1 18:49:01 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Jan 1 18:49:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19541888
sys-devel/remake: drop 4.2.1.1.4-r1 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-devel/remake/Manifest | 1 - sys-devel/remake/files/make-4.2.1-glob-v2.patch | 30 ----- .../remake/files/remake-4.2.1.1.4-fno-common.patch | 127 --------------------- sys-devel/remake/remake-4.2.1.1.4-r1.ebuild | 39 ------- 4 files changed, 197 deletions(-) diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest index c1b0a1cb96bf..b96c6a20d2ab 100644 --- a/sys-devel/remake/Manifest +++ b/sys-devel/remake/Manifest @@ -1,2 +1 @@ -DIST remake-4.2.1+dbg-1.4.tar.bz2 1508613 BLAKE2B f83bf8b1154d87d3c729b51797011511c6d9a249dffd212a551602a2af1c874d50d631d0f0e3f00d1b4484db758b7d167c416b0be185ad2a16897a077d04e9f4 SHA512 ffb7d641e0bc99794c17f634fe0aa5bf909c1e1c8eb14873dd27f2950d913db393c3532c34f417307eba351e8732c366131a23e661f5fec9529edc5d778da0d1 DIST remake-4.3+dbg-1.5.tar.gz 2546056 BLAKE2B c5c1b254d0533e0d9787d408f79e8aba93cab5185de76519dabef7ddca5c9d2021671099f9ff80df345732552f859ce31d1131b89cd56fb185bae4cee676b412 SHA512 90aa9674ed5d88b72fda5a99a103d0b1a643d10b18c1de1186478b026f6b4da73628bff75a180df880157b5cbfff1bfd782f4ee81880e0635d79113fcc0f7497 diff --git a/sys-devel/remake/files/make-4.2.1-glob-v2.patch b/sys-devel/remake/files/make-4.2.1-glob-v2.patch deleted file mode 100644 index e55a7790a3f6..000000000000 --- a/sys-devel/remake/files/make-4.2.1-glob-v2.patch +++ /dev/null @@ -1,30 +0,0 @@ -http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 - ---- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 -+++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 -@@ -11481,10 +11481,9 @@ - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif ---- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 -+++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 -@@ -399,10 +399,9 @@ - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], diff --git a/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch b/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch deleted file mode 100644 index 4367bf9332b3..000000000000 --- a/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- a/dep.h -+++ b/dep.h -@@ -134,7 +134,7 @@ - struct goaldep *read_all_makefiles (const char **makefiles); - - /*! The chain of makefiles read by read_makefile. */ --struct goaldep *read_makefiles; -+extern struct goaldep *read_makefiles; - - void eval_buffer (char *buffer, const gmk_floc *floc); - enum update_status update_goal_chain (struct goaldep *goals); ---- a/globals.c -+++ b/globals.c -@@ -120,8 +120,6 @@ - of each job stay together. */ - int output_sync = OUTPUT_SYNC_NONE; - --const char *default_shell; -- - char *remote_description = 0; - - /* Remember the original value of the SHELL variable, from the environment. */ ---- a/globals.h -+++ b/globals.h -@@ -85,6 +85,12 @@ - extern bool b_debugger_preread; - - /* Remember the original value of the SHELL variable, from the environment. */ --struct variable shell_var; -+extern struct variable shell_var; -+ -+/**! The default value of SHELL and the shell that is used when issuing -+ commands on targets. -+*/ -+extern const char *default_shell; -+ - - #endif /*GLOBALS_H*/ ---- a/main.c -+++ b/main.c -@@ -40,6 +40,8 @@ - # include <fcntl.h> - #endif - -+struct goaldep *read_makefiles; -+ - extern void initialize_stopchar_map (); - - #if defined HAVE_WAITPID || defined HAVE_WAIT3 ---- a/main.h -+++ b/main.h -@@ -35,10 +35,5 @@ - /* is default_shell unixy? */ - extern int unixy_shell; - --/**! The default value of SHELL and the shell that is used when issuing -- commands on targets. --*/ --extern char *default_shell; -- - /*! Print version information. */ - extern void print_version (void); ---- a/make.h -+++ b/make.h -@@ -333,7 +333,7 @@ - #endif - #ifdef SET_STACK_SIZE - # include <sys/resource.h> --struct rlimit stack_limit; -+extern struct rlimit stack_limit; - #endif - - /* We have to have stdarg.h or varargs.h AND v*printf or doprnt to use ---- a/print.h -+++ b/print.h -@@ -39,7 +39,7 @@ - - /* Think of the below not as an enumeration but as #defines done in a - way that we'll be able to use the value in a gdb. */ --enum debug_print_enums_e { -+extern enum debug_print_enums_e { - MAX_STACK_SHOW = 1000, - } debug_print_enums1; - ---- a/variable.c -+++ b/variable.c -@@ -29,6 +29,7 @@ - #endif - #include "hash.h" - #include "main.h" -+#include "globals.h" - - /* Incremented every time we add or remove a global variable. */ - static unsigned long variable_changenum; ---- a/variable.h -+++ b/variable.h -@@ -115,7 +115,6 @@ - extern char *variable_buffer; - extern struct variable_set_list *current_variable_set_list; - extern struct variable *default_goal_var; --extern struct variable shell_var; - - /* expand.c */ - char *variable_buffer_output (char *ptr, const char *string, unsigned int length); ---- a/debugger/file2line.h -+++ b/debugger/file2line.h -@@ -19,7 +19,7 @@ - Boston, MA 02111-1307, USA. */ - #ifndef REMAKE_FILE2LINE - #define REMAKE_FILE2LINE --struct hash_table file2lines; -+extern struct hash_table file2lines; - - typedef enum { - F2L_TARGET, ---- a/debugger/file2line.c -+++ b/debugger/file2line.c -@@ -26,6 +26,8 @@ - #include "../rule.h" - #include "./file2line.h" - -+struct hash_table file2lines; -+ - unsigned long - file2lines_hash_1 (const void *key) - { - diff --git a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild deleted file mode 100644 index 447b79c7375e..000000000000 --- a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-${PV:0:5}+dbg-${PV:6}" - -DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging" -HOMEPAGE="http://bashdb.sourceforge.net/remake/"; -SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2" - -LICENSE="GPL-1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86" -IUSE="guile readline" - -RDEPEND="readline? ( sys-libs/readline:0= ) - guile? ( >=dev-scheme/guile-1.8:= )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/make-4.2.1-glob-v2.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_configure() { - use readline || export vl_cv_lib_readline=no - econf $(use_with guile) -} - -src_install() { - default - - # delete files GNU make owns and remake doesn't care about. - rm -r "${ED}"/usr/include || die - rm "${ED}"/usr/share/info/make.info* || die -}
