| 1 |
commit: 8ea00fef95af2f301e96691ccda3d845811941ac |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 4 13:49:14 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 4 13:51:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea00fef |
| 7 |
|
| 8 |
sys-devel/make: drop old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
| 11 |
|
| 12 |
sys-devel/make/Manifest | 1 - |
| 13 |
.../make-4.1-fix_null_returns_from_ttyname.patch | 53 -------------------- |
| 14 |
sys-devel/make/make-4.1-r1.ebuild | 46 ----------------- |
| 15 |
sys-devel/make/make-4.2.1-r2.ebuild | 57 ---------------------- |
| 16 |
sys-devel/make/make-4.2.1.ebuild | 50 ------------------- |
| 17 |
5 files changed, 207 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest |
| 20 |
index a83ec28d8dc..7ce526e76ca 100644 |
| 21 |
--- a/sys-devel/make/Manifest |
| 22 |
+++ b/sys-devel/make/Manifest |
| 23 |
@@ -1,2 +1 @@ |
| 24 |
-DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 |
| 25 |
DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 |
| 26 |
|
| 27 |
diff --git a/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch b/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch |
| 28 |
deleted file mode 100644 |
| 29 |
index f6be5c9f06a..00000000000 |
| 30 |
--- a/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,53 +0,0 @@ |
| 33 |
-From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 |
| 34 |
-From: Paul Smith <psmith@×××.org> |
| 35 |
-Date: Mon, 20 Oct 2014 05:54:56 +0000 |
| 36 |
-Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname(). |
| 37 |
- |
| 38 |
---- |
| 39 |
-diff --git a/main.c b/main.c |
| 40 |
-index b2d169c..0cdb8a8 100644 |
| 41 |
---- a/main.c |
| 42 |
-+++ b/main.c |
| 43 |
-@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) |
| 44 |
- #ifdef HAVE_ISATTY |
| 45 |
- if (isatty (fileno (stdout))) |
| 46 |
- if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) |
| 47 |
-- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), |
| 48 |
-- o_default, 0)->export = v_export; |
| 49 |
-- |
| 50 |
-+ { |
| 51 |
-+ const char *tty = TTYNAME (fileno (stdout)); |
| 52 |
-+ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, |
| 53 |
-+ o_default, 0)->export = v_export; |
| 54 |
-+ } |
| 55 |
- if (isatty (fileno (stderr))) |
| 56 |
- if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) |
| 57 |
-- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), |
| 58 |
-- o_default, 0)->export = v_export; |
| 59 |
-+ { |
| 60 |
-+ const char *tty = TTYNAME (fileno (stderr)); |
| 61 |
-+ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, |
| 62 |
-+ o_default, 0)->export = v_export; |
| 63 |
-+ } |
| 64 |
- #endif |
| 65 |
- |
| 66 |
- /* Reset in case the switches changed our minds. */ |
| 67 |
-diff --git a/makeint.h b/makeint.h |
| 68 |
-index 6223936..2009f41 100644 |
| 69 |
---- a/makeint.h |
| 70 |
-+++ b/makeint.h |
| 71 |
-@@ -436,10 +436,11 @@ extern struct rlimit stack_limit; |
| 72 |
- /* The number of bytes needed to represent the largest integer as a string. */ |
| 73 |
- #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") |
| 74 |
- |
| 75 |
-+#define DEFAULT_TTYNAME "true" |
| 76 |
- #ifdef HAVE_TTYNAME |
| 77 |
- # define TTYNAME(_f) ttyname (_f) |
| 78 |
- #else |
| 79 |
--# define TTYNAME(_f) "true" |
| 80 |
-+# define TTYNAME(_f) DEFAULT_TTYNAME |
| 81 |
- #endif |
| 82 |
- |
| 83 |
- |
| 84 |
--- |
| 85 |
-cgit v0.9.0.2 |
| 86 |
|
| 87 |
diff --git a/sys-devel/make/make-4.1-r1.ebuild b/sys-devel/make/make-4.1-r1.ebuild |
| 88 |
deleted file mode 100644 |
| 89 |
index b893857aa79..00000000000 |
| 90 |
--- a/sys-devel/make/make-4.1-r1.ebuild |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,46 +0,0 @@ |
| 93 |
-# Copyright 1999-2018 Gentoo Foundation |
| 94 |
-# Distributed under the terms of the GNU General Public License v2 |
| 95 |
- |
| 96 |
-EAPI=4 |
| 97 |
- |
| 98 |
-inherit flag-o-matic eutils |
| 99 |
- |
| 100 |
-DESCRIPTION="Standard tool to compile source trees" |
| 101 |
-HOMEPAGE="https://www.gnu.org/software/make/make.html" |
| 102 |
-SRC_URI="mirror://gnu//make/${P}.tar.bz2" |
| 103 |
- |
| 104 |
-LICENSE="GPL-3+" |
| 105 |
-SLOT="0" |
| 106 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 107 |
-IUSE="guile nls static" |
| 108 |
- |
| 109 |
-CDEPEND="guile? ( >=dev-scheme/guile-1.8 )" |
| 110 |
-DEPEND="${CDEPEND} |
| 111 |
- nls? ( sys-devel/gettext )" |
| 112 |
-RDEPEND="${CDEPEND} |
| 113 |
- nls? ( virtual/libintl )" |
| 114 |
- |
| 115 |
-src_prepare() { |
| 116 |
- epatch \ |
| 117 |
- "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch \ |
| 118 |
- "${FILESDIR}"/${P}-fix_null_returns_from_ttyname.patch |
| 119 |
-} |
| 120 |
- |
| 121 |
-src_configure() { |
| 122 |
- use static && append-ldflags -static |
| 123 |
- econf \ |
| 124 |
- --program-prefix=g \ |
| 125 |
- $(use_with guile) \ |
| 126 |
- $(use_enable nls) |
| 127 |
-} |
| 128 |
- |
| 129 |
-src_install() { |
| 130 |
- emake DESTDIR="${D}" install |
| 131 |
- dodoc AUTHORS NEWS README* |
| 132 |
- if [[ ${USERLAND} == "GNU" ]] ; then |
| 133 |
- # we install everywhere as 'gmake' but on GNU systems, |
| 134 |
- # symlink 'make' to 'gmake' |
| 135 |
- dosym gmake /usr/bin/make |
| 136 |
- dosym gmake.1 /usr/share/man/man1/make.1 |
| 137 |
- fi |
| 138 |
-} |
| 139 |
|
| 140 |
diff --git a/sys-devel/make/make-4.2.1-r2.ebuild b/sys-devel/make/make-4.2.1-r2.ebuild |
| 141 |
deleted file mode 100644 |
| 142 |
index c52a434b513..00000000000 |
| 143 |
--- a/sys-devel/make/make-4.2.1-r2.ebuild |
| 144 |
+++ /dev/null |
| 145 |
@@ -1,57 +0,0 @@ |
| 146 |
-# Copyright 1999-2018 Gentoo Foundation |
| 147 |
-# Distributed under the terms of the GNU General Public License v2 |
| 148 |
- |
| 149 |
-EAPI=6 |
| 150 |
- |
| 151 |
-inherit flag-o-matic |
| 152 |
- |
| 153 |
-DESCRIPTION="Standard tool to compile source trees" |
| 154 |
-HOMEPAGE="https://www.gnu.org/software/make/make.html" |
| 155 |
-SRC_URI="mirror://gnu//make/${P}.tar.bz2" |
| 156 |
- |
| 157 |
-LICENSE="GPL-3+" |
| 158 |
-SLOT="0" |
| 159 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 160 |
-IUSE="guile nls static" |
| 161 |
- |
| 162 |
-CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )" |
| 163 |
-DEPEND="${CDEPEND} |
| 164 |
- nls? ( sys-devel/gettext )" |
| 165 |
-RDEPEND="${CDEPEND} |
| 166 |
- nls? ( virtual/libintl )" |
| 167 |
- |
| 168 |
-PATCHES=( |
| 169 |
- "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch |
| 170 |
- "${FILESDIR}"/${PN}-4.2-default-cxx.patch |
| 171 |
- "${FILESDIR}"/${PN}-4.2.1-perl526.patch |
| 172 |
- "${FILESDIR}"/${PN}-4.2.1-glob-internals.patch |
| 173 |
-) |
| 174 |
- |
| 175 |
-src_prepare() { |
| 176 |
- default |
| 177 |
- # This patch requires special handling as it modifies configure.ac |
| 178 |
- # which in turn triggers maintainer-mode when being applied the |
| 179 |
- # usual way. |
| 180 |
- eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch |
| 181 |
-} |
| 182 |
- |
| 183 |
-src_configure() { |
| 184 |
- use static && append-ldflags -static |
| 185 |
- local myeconfargs=( |
| 186 |
- --program-prefix=g |
| 187 |
- $(use_with guile) |
| 188 |
- $(use_enable nls) |
| 189 |
- ) |
| 190 |
- econf "${myeconfargs[@]}" |
| 191 |
-} |
| 192 |
- |
| 193 |
-src_install() { |
| 194 |
- emake DESTDIR="${D}" install |
| 195 |
- dodoc AUTHORS NEWS README* |
| 196 |
- if [[ ${USERLAND} == "GNU" ]] ; then |
| 197 |
- # we install everywhere as 'gmake' but on GNU systems, |
| 198 |
- # symlink 'make' to 'gmake' |
| 199 |
- dosym gmake /usr/bin/make |
| 200 |
- dosym gmake.1 /usr/share/man/man1/make.1 |
| 201 |
- fi |
| 202 |
-} |
| 203 |
|
| 204 |
diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild |
| 205 |
deleted file mode 100644 |
| 206 |
index 807b071729f..00000000000 |
| 207 |
--- a/sys-devel/make/make-4.2.1.ebuild |
| 208 |
+++ /dev/null |
| 209 |
@@ -1,50 +0,0 @@ |
| 210 |
-# Copyright 1999-2018 Gentoo Foundation |
| 211 |
-# Distributed under the terms of the GNU General Public License v2 |
| 212 |
- |
| 213 |
-EAPI=5 |
| 214 |
- |
| 215 |
-inherit flag-o-matic eutils |
| 216 |
- |
| 217 |
-DESCRIPTION="Standard tool to compile source trees" |
| 218 |
-HOMEPAGE="https://www.gnu.org/software/make/make.html" |
| 219 |
-SRC_URI="mirror://gnu//make/${P}.tar.bz2" |
| 220 |
- |
| 221 |
-LICENSE="GPL-3+" |
| 222 |
-SLOT="0" |
| 223 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 224 |
-IUSE="guile nls static" |
| 225 |
- |
| 226 |
-CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )" |
| 227 |
-DEPEND="${CDEPEND} |
| 228 |
- nls? ( sys-devel/gettext )" |
| 229 |
-RDEPEND="${CDEPEND} |
| 230 |
- nls? ( virtual/libintl )" |
| 231 |
- |
| 232 |
-PATCHES=( |
| 233 |
- "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch |
| 234 |
- "${FILESDIR}"/${PN}-4.2.1-perl526.patch |
| 235 |
-) |
| 236 |
- |
| 237 |
-src_prepare() { |
| 238 |
- epatch "${PATCHES[@]}" |
| 239 |
- epatch_user |
| 240 |
-} |
| 241 |
- |
| 242 |
-src_configure() { |
| 243 |
- use static && append-ldflags -static |
| 244 |
- econf \ |
| 245 |
- --program-prefix=g \ |
| 246 |
- $(use_with guile) \ |
| 247 |
- $(use_enable nls) |
| 248 |
-} |
| 249 |
- |
| 250 |
-src_install() { |
| 251 |
- emake DESTDIR="${D}" install |
| 252 |
- dodoc AUTHORS NEWS README* |
| 253 |
- if [[ ${USERLAND} == "GNU" ]] ; then |
| 254 |
- # we install everywhere as 'gmake' but on GNU systems, |
| 255 |
- # symlink 'make' to 'gmake' |
| 256 |
- dosym gmake /usr/bin/make |
| 257 |
- dosym gmake.1 /usr/share/man/man1/make.1 |
| 258 |
- fi |
| 259 |
-} |
Archives