gentoo resync : 01.12.2017

4 files changed, 11 insertions, 97 deletions

diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index b6c7507ee6f6..1cb0ab14f1b8 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,7 +1,6 @@
 AUX gnatmem-2016-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
-AUX gnatmem-2017-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
-DIST gnatmem-gpl-2016-src.tar.gz 80104 SHA256 bd39c7b18e4f52fdd029b999f7e1af52d01c975063c28ae1ef6875e4fc5e224f SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b WHIRLPOOL 8aee794c18efcbdbb50a4d58b9f247de30dea8d5b0a41034b1e20ad7786eefab5dfd14bf99994340a993d67989eab939ba78097d46933d841686d1bbc68fce0b
-DIST gnatmem-gpl-2017-src.tar.gz 80106 SHA256 11a27a66030b1a074875ccdaa0ffb06e86d687e1904ab0f5922e08bb488e5e7c SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 WHIRLPOOL 6599c8b77e89d7bc1f6b1eea459009aa2626173a7ebe47b65ead3ba76a109699ff8d0f27cfe1cea9fb0a8cb90cf9a897f70cf8af4647f21feec87b422e544c1b
-EBUILD gnatmem-2016.ebuild 798 BLAKE2B 6ece7c705de8475e47a7b5e005ba94ec7c298ba77b51dd031a68aede5e82afa2a0e9db36e2a7806ca8737fea220436f5dd5bf1adfa906299f8d8d528453ef909 SHA512 aa134d61620fac8b91ab2548f632ab35657c07cf73aa8a4cb93471a2907ea8efaa030f4a5e91b135d5df2ea922587bbc749488db52e08a543d4bc68a747d2e9e
-EBUILD gnatmem-2017.ebuild 798 BLAKE2B be8f1beeac2846a2b16667fab975cc8ba8d267a22c7baeee234aaa40f27392c92f70ed60f2b3251f8ec977d7ffdd047cd4af7edcb483a4731498be03db6aac54 SHA512 f1549b01ac1d8a23562e741cc2e1ac4034f49f60c72d247b6a9432d7903b442ad51f1a6bb72c35aa636820388b9c2696323fcd08ff48a92f941bd11906ee169c
+DIST gnatmem-gpl-2016-src.tar.gz 80104 BLAKE2B c7ccdf4a8b2c91117550592763c467a32befc00ad3fa6488963635be283d6e84dd572123d9586166af215dd845aa785f5953dae7fadca6e49fbb6004af0576fa SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b
+DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897
+EBUILD gnatmem-2016.ebuild 842 BLAKE2B dd7e2a614fb95e1efd71c52b656add578e0f19d75ea5ee196583af2d5a52fa04c953719cfc2b4a6ce78ad0cfbd87e9d0cbe60760f0971480b10dea6255fdd0cf SHA512 4e664ce22d13588ff3df666eab80c33eeb11e02e9a8afe5133f7a09174e61e7b60ec35468fcfa74773473adb841b2df31d659e36adec12dce8b346a5ac85be91
+EBUILD gnatmem-2017.ebuild 848 BLAKE2B 3b84c0264ea45eceb521e601c0294c2d73f11f338e4b64177f9aa8224b97c76e93dba33764e720042743ce07de47b84584b395735ab6d36be17da428193b58dd SHA512 458273979293719d0332de7f911593f5cf8f14968cd53a3b20ed94b4ddd941d9190bc69dda2e97a121a41c7b9d937f9dae2bc7b9a42c5cce89a4833c32b1bbd8
 MISC metadata.xml 1138 BLAKE2B 867c1ccc45c510480cc4e93b62534182248cfe2e7aad4e5e8e3c5fef153590c2a9832687a5614786b115145d477ddc74a38008566266fa44e9e5e0a4769332d1 SHA512 1b4794806992a99021a8c8c0d8c49374ca2ca676b5ac0dd60fd2e433d8f91225033255a59ab5e5adea2ed0fea20ce704ad7b7f2aa2c7538f8d504ba3df122b7b
diff --git a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch b/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch
deleted file mode 100644
index 69530dd24b23..000000000000
--- a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- 1/configure.in.old	2016-12-08 20:57:53.942004080 +0100
-+++ 1/configure.in	2016-12-08 21:00:10.393677257 +0100
-@@ -2,23 +2,14 @@
- AC_INIT(gnatmem.gpr.in)
- AC_CANONICAL_SYSTEM
- AC_PROG_CC(gcc)
--AC_CHECK_TOOL(GNATBIND,gnatbind,"no")
--if test ${GNATBIND} = "no"; then
--   AC_MSG_ERROR(Ada compiler needed,1)
--fi
-+AC_CONFIG_HEADERS(config.h:config.in)
-+AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])
- AC_ARG_WITH(binutils-buildtree,
-             [AC_HELP_STRING(
-              [--with-binutils-buildtree=<dir>],
-              [Specifify location of binutils build tree])],
-             BINUTILS_OBJDIR=$withval,
-             BINUTILS_OBJDIR=no)
--AC_MSG_CHECKING([for binutils build tree validity])
--if test -f "$BINUTILS_OBJDIR/bfd/libbfd.a"; then
--   AC_MSG_RESULT(yes)
--else
--   AC_MSG_RESULT(no) 
--   AC_MSG_FAILURE([need valid binutils build tree directory (got $BINUTILS_OBJDIR)])
--fi
- 
- AC_ARG_WITH(binutils-sources,
-             [AC_HELP_STRING(
-@@ -26,21 +21,6 @@
-              [Specifify location of binutils sources])],
-             BINUTILS_SRCDIR=$withval,
-             BINUTILS_SRCDIR=auto)
--if test "$BINUTILS_SRCDIR" = "auto"; then
--   BINUTILS_SRCDIR=`cat "$BINUTILS_OBJDIR/Makefile" | sed -n -e "/^ *srcdir *=/ s/^ *srcdir *= *// p"`
--   case "$BINUTILS_SRC_DIR" in
--     /*) ;;
--      *) # assume we have relative path
--         BINUTILS_SRCDIR="$BINUTILS_OBJDIR/$BINUTILS_SRCDIR";;
--   esac
--fi
--AC_MSG_CHECKING([for binutils source dir validity])
--if test -f "$BINUTILS_SRCDIR/bfd/Makefile.in"; then
--   AC_MSG_RESULT(yes)
--else
--   AC_MSG_RESULT(no)
--   AC_MSG_FAILURE([need valid binutils sources directory])
--fi
- 
- AC_SUBST(BINUTILS_OBJDIR)
- AC_SUBST(BINUTILS_SRCDIR)
---- gnatmem-gpl-2016-src/gnatmem.gpr.in.old	2017-02-02 22:15:30.247906007 +0100
-+++ gnatmem-gpl-2016-src/gnatmem.gpr.in	2017-02-02 22:17:22.604974363 +0100
-@@ -10,8 +10,10 @@
-    for Languages use ("ada", "c");
- 
-    package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-       for Default_Switches ("ada") use ("-O2", "-W", "-Wall", "-gnatpg");
-       for Default_Switches ("c")   use ("-O2",
-+                                        "-I..",
-                                         "-I" & BINUTILS_OBJDIR & "/binutils",
-                                         "-I" & BINUTILS_OBJDIR & "/bfd",
-                                         "-I" & BINUTILS_SRCDIR & "/include");
-@@ -19,8 +21,8 @@
- 
-    package Linker is
-       for Default_Switches ("ada") use
--         (BINUTILS_OBJDIR & "/bfd/libbfd.a",
--          BINUTILS_OBJDIR & "/libiberty/libiberty.a",
-+         ("-lbfd",
-+          "-liberty",
-           "@LIBDL@",
-           "@LIBZ@");
-    end Linker;
---- gnatmem-gpl-2015-src/src/libaddr2line.c.old	2017-01-04 21:03:36.185233702 +0100
-+++ gnatmem-gpl-2015-src/src/libaddr2line.c	2017-01-04 21:04:17.680455390 +0100
-@@ -23,9 +23,9 @@
- #include <string.h>
- #include <stdlib.h>
- 
--#include "bfd.h"
--#include "libiberty.h"
--#include "demangle.h"
-+#include <bfd.h>
-+#include <libiberty/libiberty.h>
-+#include <libiberty/demangle.h>
- 
- static asymbol **cur_syms;		/* Symbol table.  */
- static bfd *cur_bfd;
diff --git a/dev-ada/gnatmem/gnatmem-2016.ebuild b/dev-ada/gnatmem/gnatmem-2016.ebuild
index 5875024baefd..1b7bae00d069 100644
--- a/dev-ada/gnatmem/gnatmem-2016.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2016.ebuild
@@ -14,11 +14,13 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> ${MYP}.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="+gnat_2016 gnat_2017"
 
 RDEPEND=""
 DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
 S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild
index ee97065ed89f..c9a384fa74dc 100644
--- a/dev-ada/gnatmem/gnatmem-2017.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2017.ebuild
@@ -14,14 +14,16 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> ${MYP}.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND=""
 DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
 S="${WORKDIR}"/${MYP}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_prepare() {
 	default