| 1 |
commit: ed8058dcf99ea3279e4e1e9b7a1564089939d885 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 30 18:19:32 2017 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 30 18:19:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed8058dc |
| 7 |
|
| 8 |
dev-ada/gnatmem: Defaulting some use flags |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-ada/gnatmem/Manifest | 4 +- |
| 13 |
dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch | 89 ------------------------- |
| 14 |
dev-ada/gnatmem/gnatmem-2016.ebuild | 4 +- |
| 15 |
dev-ada/gnatmem/gnatmem-2017.ebuild | 6 +- |
| 16 |
4 files changed, 9 insertions(+), 94 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest |
| 19 |
index 2669213c415..4e74a9f5fdd 100644 |
| 20 |
--- a/dev-ada/gnatmem/Manifest |
| 21 |
+++ b/dev-ada/gnatmem/Manifest |
| 22 |
@@ -1,2 +1,2 @@ |
| 23 |
-DIST gnatmem-gpl-2016-src.tar.gz 80104 SHA256 bd39c7b18e4f52fdd029b999f7e1af52d01c975063c28ae1ef6875e4fc5e224f SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b WHIRLPOOL 8aee794c18efcbdbb50a4d58b9f247de30dea8d5b0a41034b1e20ad7786eefab5dfd14bf99994340a993d67989eab939ba78097d46933d841686d1bbc68fce0b |
| 24 |
-DIST gnatmem-gpl-2017-src.tar.gz 80106 SHA256 11a27a66030b1a074875ccdaa0ffb06e86d687e1904ab0f5922e08bb488e5e7c SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 WHIRLPOOL 6599c8b77e89d7bc1f6b1eea459009aa2626173a7ebe47b65ead3ba76a109699ff8d0f27cfe1cea9fb0a8cb90cf9a897f70cf8af4647f21feec87b422e544c1b |
| 25 |
+DIST gnatmem-gpl-2016-src.tar.gz 80104 BLAKE2B c7ccdf4a8b2c91117550592763c467a32befc00ad3fa6488963635be283d6e84dd572123d9586166af215dd845aa785f5953dae7fadca6e49fbb6004af0576fa SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b |
| 26 |
+DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 |
| 27 |
|
| 28 |
diff --git a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch b/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 69530dd24b2..00000000000 |
| 31 |
--- a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,89 +0,0 @@ |
| 34 |
---- 1/configure.in.old 2016-12-08 20:57:53.942004080 +0100 |
| 35 |
-+++ 1/configure.in 2016-12-08 21:00:10.393677257 +0100 |
| 36 |
-@@ -2,23 +2,14 @@ |
| 37 |
- AC_INIT(gnatmem.gpr.in) |
| 38 |
- AC_CANONICAL_SYSTEM |
| 39 |
- AC_PROG_CC(gcc) |
| 40 |
--AC_CHECK_TOOL(GNATBIND,gnatbind,"no") |
| 41 |
--if test ${GNATBIND} = "no"; then |
| 42 |
-- AC_MSG_ERROR(Ada compiler needed,1) |
| 43 |
--fi |
| 44 |
-+AC_CONFIG_HEADERS(config.h:config.in) |
| 45 |
-+AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.]) |
| 46 |
- AC_ARG_WITH(binutils-buildtree, |
| 47 |
- [AC_HELP_STRING( |
| 48 |
- [--with-binutils-buildtree=<dir>], |
| 49 |
- [Specifify location of binutils build tree])], |
| 50 |
- BINUTILS_OBJDIR=$withval, |
| 51 |
- BINUTILS_OBJDIR=no) |
| 52 |
--AC_MSG_CHECKING([for binutils build tree validity]) |
| 53 |
--if test -f "$BINUTILS_OBJDIR/bfd/libbfd.a"; then |
| 54 |
-- AC_MSG_RESULT(yes) |
| 55 |
--else |
| 56 |
-- AC_MSG_RESULT(no) |
| 57 |
-- AC_MSG_FAILURE([need valid binutils build tree directory (got $BINUTILS_OBJDIR)]) |
| 58 |
--fi |
| 59 |
- |
| 60 |
- AC_ARG_WITH(binutils-sources, |
| 61 |
- [AC_HELP_STRING( |
| 62 |
-@@ -26,21 +21,6 @@ |
| 63 |
- [Specifify location of binutils sources])], |
| 64 |
- BINUTILS_SRCDIR=$withval, |
| 65 |
- BINUTILS_SRCDIR=auto) |
| 66 |
--if test "$BINUTILS_SRCDIR" = "auto"; then |
| 67 |
-- BINUTILS_SRCDIR=`cat "$BINUTILS_OBJDIR/Makefile" | sed -n -e "/^ *srcdir *=/ s/^ *srcdir *= *// p"` |
| 68 |
-- case "$BINUTILS_SRC_DIR" in |
| 69 |
-- /*) ;; |
| 70 |
-- *) # assume we have relative path |
| 71 |
-- BINUTILS_SRCDIR="$BINUTILS_OBJDIR/$BINUTILS_SRCDIR";; |
| 72 |
-- esac |
| 73 |
--fi |
| 74 |
--AC_MSG_CHECKING([for binutils source dir validity]) |
| 75 |
--if test -f "$BINUTILS_SRCDIR/bfd/Makefile.in"; then |
| 76 |
-- AC_MSG_RESULT(yes) |
| 77 |
--else |
| 78 |
-- AC_MSG_RESULT(no) |
| 79 |
-- AC_MSG_FAILURE([need valid binutils sources directory]) |
| 80 |
--fi |
| 81 |
- |
| 82 |
- AC_SUBST(BINUTILS_OBJDIR) |
| 83 |
- AC_SUBST(BINUTILS_SRCDIR) |
| 84 |
---- gnatmem-gpl-2016-src/gnatmem.gpr.in.old 2017-02-02 22:15:30.247906007 +0100 |
| 85 |
-+++ gnatmem-gpl-2016-src/gnatmem.gpr.in 2017-02-02 22:17:22.604974363 +0100 |
| 86 |
-@@ -10,8 +10,10 @@ |
| 87 |
- for Languages use ("ada", "c"); |
| 88 |
- |
| 89 |
- package Compiler is |
| 90 |
-+ for Driver ("C") use External ("CC", "gcc"); |
| 91 |
- for Default_Switches ("ada") use ("-O2", "-W", "-Wall", "-gnatpg"); |
| 92 |
- for Default_Switches ("c") use ("-O2", |
| 93 |
-+ "-I..", |
| 94 |
- "-I" & BINUTILS_OBJDIR & "/binutils", |
| 95 |
- "-I" & BINUTILS_OBJDIR & "/bfd", |
| 96 |
- "-I" & BINUTILS_SRCDIR & "/include"); |
| 97 |
-@@ -19,8 +21,8 @@ |
| 98 |
- |
| 99 |
- package Linker is |
| 100 |
- for Default_Switches ("ada") use |
| 101 |
-- (BINUTILS_OBJDIR & "/bfd/libbfd.a", |
| 102 |
-- BINUTILS_OBJDIR & "/libiberty/libiberty.a", |
| 103 |
-+ ("-lbfd", |
| 104 |
-+ "-liberty", |
| 105 |
- "@LIBDL@", |
| 106 |
- "@LIBZ@"); |
| 107 |
- end Linker; |
| 108 |
---- gnatmem-gpl-2015-src/src/libaddr2line.c.old 2017-01-04 21:03:36.185233702 +0100 |
| 109 |
-+++ gnatmem-gpl-2015-src/src/libaddr2line.c 2017-01-04 21:04:17.680455390 +0100 |
| 110 |
-@@ -23,9 +23,9 @@ |
| 111 |
- #include <string.h> |
| 112 |
- #include <stdlib.h> |
| 113 |
- |
| 114 |
--#include "bfd.h" |
| 115 |
--#include "libiberty.h" |
| 116 |
--#include "demangle.h" |
| 117 |
-+#include <bfd.h> |
| 118 |
-+#include <libiberty/libiberty.h> |
| 119 |
-+#include <libiberty/demangle.h> |
| 120 |
- |
| 121 |
- static asymbol **cur_syms; /* Symbol table. */ |
| 122 |
- static bfd *cur_bfd; |
| 123 |
|
| 124 |
diff --git a/dev-ada/gnatmem/gnatmem-2016.ebuild b/dev-ada/gnatmem/gnatmem-2016.ebuild |
| 125 |
index 5875024baef..1b7bae00d06 100644 |
| 126 |
--- a/dev-ada/gnatmem/gnatmem-2016.ebuild |
| 127 |
+++ b/dev-ada/gnatmem/gnatmem-2016.ebuild |
| 128 |
@@ -14,11 +14,13 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> ${MYP}.t |
| 129 |
LICENSE="GPL-3" |
| 130 |
SLOT="0" |
| 131 |
KEYWORDS="~amd64" |
| 132 |
-IUSE="gnat_2016 gnat_2017" |
| 133 |
+IUSE="+gnat_2016 gnat_2017" |
| 134 |
|
| 135 |
RDEPEND="" |
| 136 |
DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
| 137 |
|
| 138 |
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" |
| 139 |
+ |
| 140 |
S="${WORKDIR}"/${MYP} |
| 141 |
|
| 142 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 143 |
|
| 144 |
diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild |
| 145 |
index ee97065ed89..c9a384fa74d 100644 |
| 146 |
--- a/dev-ada/gnatmem/gnatmem-2017.ebuild |
| 147 |
+++ b/dev-ada/gnatmem/gnatmem-2017.ebuild |
| 148 |
@@ -14,14 +14,16 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> ${MYP}.t |
| 149 |
LICENSE="GPL-3" |
| 150 |
SLOT="0" |
| 151 |
KEYWORDS="~amd64" |
| 152 |
-IUSE="gnat_2016 gnat_2017" |
| 153 |
+IUSE="gnat_2016 +gnat_2017" |
| 154 |
|
| 155 |
RDEPEND="" |
| 156 |
DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
| 157 |
|
| 158 |
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" |
| 159 |
+ |
| 160 |
S="${WORKDIR}"/${MYP} |
| 161 |
|
| 162 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 163 |
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch ) |
| 164 |
|
| 165 |
src_prepare() { |
| 166 |
default |
Archives