diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2018-11-27 21:44:05 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2018-11-27 21:44:05 +0000 |
| commit | 867786859e527834379da6f59d32a15338b6d3a3 (patch) | |
| tree | 8f9c3edf875513dc94c7aa1a59446bec3880a04f | |
| parent | 2018-11-27 21:24:18 UTC (diff) | |
| parent | dev-ada/asis: 2017 version build also with gnatcoll-core (diff) | |
| download | gentoo-867786859e527834379da6f59d32a15338b6d3a3.tar.gz gentoo-867786859e527834379da6f59d32a15338b6d3a3.tar.bz2 gentoo-867786859e527834379da6f59d32a15338b6d3a3.zip | |
Merge updates from master
| -rw-r--r-- | dev-ada/asis/asis-2017.ebuild | 5 | ||||
| -rw-r--r-- | dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild | 5 | ||||
| -rw-r--r-- | dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.100.0.ebuild | 37 | ||||
| -rw-r--r-- | dev-perl/Getopt-Long-Descriptive/Manifest | 1 |
4 files changed, 8 insertions, 40 deletions
diff --git a/dev-ada/asis/asis-2017.ebuild b/dev-ada/asis/asis-2017.ebuild index 7c251796ff8f..337e4c0f972e 100644 --- a/dev-ada/asis/asis-2017.ebuild +++ b/dev-ada/asis/asis-2017.ebuild @@ -17,7 +17,10 @@ KEYWORDS="amd64 x86" IUSE="gnat_2016 +gnat_2017" RDEPEND="dev-ada/gnat_util[gnat_2017] - dev-ada/gnatcoll[gnat_2017,projects,shared]" + || ( + dev-ada/gnatcoll-core[gnat_2017,shared] + dev-ada/gnatcoll[gnat_2017,projects,shared] + )" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2017]" diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild index f4d6bb2c005f..732ca48ef1b4 100644 --- a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild +++ b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,8 +17,11 @@ S="${WORKDIR}/fstrcmp-0.7.D001" KEYWORDS="~amd64 ~x86" DEPEND=" + sys-apps/groff doc? ( app-text/ghostscript-gpl ) + test? ( app-text/ghostscript-gpl ) " +RESTRICT="!test? ( test )" src_prepare() { default diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.100.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.100.0.ebuild deleted file mode 100644 index ffc1cde9eeb1..000000000000 --- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.100.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=RJBS -DIST_VERSION=0.100 -inherit perl-module - -DESCRIPTION="Getopt::Long with usage text" - -SLOT="0" -KEYWORDS="amd64 arm ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris" -IUSE="test minimal" - -CONFLICTS="!<dev-perl/MooseX-Getopt-0.660.0" -# File::Basename -> perl -# List::Util, Scalar::Util -> perl-Scalar-List-Utils -# Sub::Exporter::Util -> Sub-Exporter -RDEPEND="${CONFLICTS} - virtual/perl-Carp - >=virtual/perl-Getopt-Long-2.330.0 - >=dev-perl/Params-Validate-0.970.0 - virtual/perl-Scalar-List-Utils - >=dev-perl/Sub-Exporter-0.972.0 -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) - >=dev-perl/CPAN-Meta-Check-0.11.0 - virtual/perl-File-Spec - dev-perl/Test-Fatal - >=virtual/perl-Test-Simple-0.960.0 - >=dev-perl/Test-Warnings-0.5.0 - ) -" diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest index 7f9332dfebff..0c155dba58fc 100644 --- a/dev-perl/Getopt-Long-Descriptive/Manifest +++ b/dev-perl/Getopt-Long-Descriptive/Manifest @@ -1,2 +1 @@ -DIST Getopt-Long-Descriptive-0.100.tar.gz 31366 BLAKE2B 09fac34156dfbd22f3d14f85b44c0c327e0d6e7b535d2c4b80a492a1f4ab184b85d7b14456c375ce6cf882c69c4e99e3341a6ee764fea6ea966b85068a2410cb SHA512 0efd6f707487b9b44d5c3b5c9e46c3718546e44bf1b66c198be6ebfc922e7bdb23a9c57c5a9c0985dc3769617141696750e1bd982457247b679e3bdb5f9f16c7 DIST Getopt-Long-Descriptive-0.103.tar.gz 32683 BLAKE2B 9e457690d61e8b2330761ffd09174403d7e485c80af84d2cc61b7443762dcbe9832a15c589b729536103e80c75556f60040d5d1d3637a5eb3226bf1cc1d57ce6 SHA512 9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f |