summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-06-20 09:40:34 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-06-20 09:40:34 +0000
commitd35287afecc172ff7215e42b217e0d16d42f5639 (patch)
tree1989584c04a4f51cfcc7a8a9d156275758f7d48f
parent2021-06-20 09:10:36 UTC (diff)
parentnet-misc/mico: drop 9999 (diff)
downloadgentoo-d35287afecc172ff7215e42b217e0d16d42f5639.tar.gz
gentoo-d35287afecc172ff7215e42b217e0d16d42f5639.tar.bz2
gentoo-d35287afecc172ff7215e42b217e0d16d42f5639.zip
Merge updates from master
-rw-r--r--dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild2
-rw-r--r--dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild2
-rw-r--r--dev-util/dejagnu/Manifest1
-rw-r--r--dev-util/dejagnu/dejagnu-1.6.2.ebuild2
-rw-r--r--dev-util/dejagnu/dejagnu-1.6.3.ebuild20
-rw-r--r--net-misc/mico/mico-9999.ebuild146
-rw-r--r--profiles/package.deprecated5
-rw-r--r--virtual/libffi/libffi-3.3_rc0.ebuild15
-rw-r--r--virtual/libffi/metadata.xml9
9 files changed, 25 insertions, 177 deletions
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
index bca42f7ddb2e..4317ea25ff71 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P%.rc*}"
BUILDDIR="${S}/jsobj"
RDEPEND=">=dev-libs/nspr-4.13.1
- virtual/libffi
+ dev-libs/libffi
sys-libs/readline:0=
>=sys-libs/zlib-1.2.3
system-icu? ( >=dev-libs/icu-58.1:= )"
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
index 4404665f45e1..f42f9f9b8b34 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P%.rc*}"
BUILDDIR="${S}/jsobj"
RDEPEND=">=dev-libs/nspr-4.13.1
- virtual/libffi
+ dev-libs/libffi
sys-libs/readline:0=
>=sys-libs/zlib-1.2.3:=
system-icu? ( >=dev-libs/icu-59.1:= )"
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index cc5d3fe6f391..1fe1ccfc2b7f 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1 +1,2 @@
DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
+DIST dejagnu-1.6.3.tar.gz 622059 BLAKE2B d22d66a233c2643c98f45d260585790b4c1293de2bc84470e7942e0364e0cb15f55888a3b6ab13e82823f4e03198159c93e1904571a5df3fcd6f2da568078726 SHA512 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index aef6b3c5cf26..fece44705350 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -12,6 +12,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
+RESTRICT=test # needs fixing
+
DEPEND="dev-lang/tcl
dev-tcltk/expect"
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
new file mode 100644
index 000000000000..443cbff69da8
--- /dev/null
+++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Framework for testing other programs"
+HOMEPAGE="https://www.gnu.org/software/dejagnu/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+#RESTRICT="!test? ( test )"
+RESTRICT="test" # needs fixing
+
+RDEPEND="dev-tcltk/expect"
+#DEPEND="test? ( dev-tcltk/expect )"
+BDEPEND="virtual/awk"
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
deleted file mode 100644
index 52c03727f64a..000000000000
--- a/net-misc/mico/mico-9999.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs autotools
-
-if [[ ${PV} == 9999 ]]; then
- EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
- inherit darcs
- SRC_URI=""
- PATCHES="${WORKDIR}/${P}-gentoo.patch"
-else
- SRC_URI="
- http://www.mico.org/${P}.tar.gz
- https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
- "
- PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
- KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-fi
-
-DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
-HOMEPAGE="http://www.mico.org/"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="gtk postgres ssl tcl threads X"
-RESTRICT="test" #298101
-
-# doesn't compile:
-# bluetooth? ( net-wireless/bluez )
-
-RDEPEND="
- gtk? ( x11-libs/gtk+:2 )
- postgres? ( dev-db/postgresql:* )
- ssl? ( dev-libs/openssl:0= )
- tcl? ( dev-lang/tcl:0 )
- X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=sys-devel/flex-2.5.2
- >=sys-devel/bison-1.22
-"
-
-if [[ ${PV} == 9999 ]]; then
- src_unpack() {
- wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die
- darcs_src_unpack
- default
- }
-else
- S=${WORKDIR}/${PN}
-fi
-
-src_prepare() {
- default
-
- mv configure.in configure.ac || die #426262
- eautoreconf
-
- # cannot use big TOC (AIX only), gdb doesn't like it.
- # This assumes that the compiler (or -wrapper) uses
- # gcc flag '-mminimal-toc' for compilation.
- sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
-}
-
-src_configure() {
- tc-export CC CXX
- append-cxxflags -fno-strict-aliasing
-
- # Don't know which version of JavaCUP would suffice, but there is no
- # configure argument to disable checking for JavaCUP.
- # So we override the configure check to not find 'javac'.
- export ac_cv_path_JAVAC=no
-
- # '--without-ssl' just does not add another search path - the only way
- # to disable openssl utilization seems to override the configure check.
- use ssl || export ac_cv_lib_ssl_open=no
-
- local myconf=
- myconf() {
- myconf="${myconf} $*"
- }
-
- myconf --disable-mini-stl
- myconf $(use_enable threads)
-
- # '--without-*' or '--with-*=no' does not disable some features,
- # the value needs to be empty instead.
- # This applies to: pgsql, qt, tcl, bluetooth.
- myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
- myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr)
- # bluetooth and wireless both don't compile cleanly
- myconf --with-bluetooth=''
- myconf --disable-wireless
- # But --without-x works.
- myconf $(use_with X x "${EPREFIX}"/usr)
- # Same for gtk after patch 013, searches for gtk release.
- myconf $(use_with gtk gtk 2)
-
- # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
- [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
-
- if [[ ${CHOST} == *-winnt* ]]; then
- # disabling static libs, since ar on interix takes nearly
- # one hour per library, thanks to mico's monster objects.
- use threads &&
- ewarn "disabling USE='threads', does not work on ${CHOST}"
- myconf --disable-threads --disable-static --enable-final
- append-flags -D__STDC__
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- emake INSTDIR="${ED}"/usr SHARED_INSTDIR="${ED}"/usr install LDCONFIG=:
- if [[ $(get_libdir) != lib ]]; then #500744
- mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
- fi
-
- # avoid conflict with net-dns/nsd, bug#544488
- mv "${ED}"/usr/bin/{,mico-}nsd || die
- mv "${ED}"/usr/man/man8/{,mico-}nsd.8 || die
-
- # avoid conflict with net-misc/eventd, bug#632170
- mv "${ED}"/usr/bin/{,mico-}eventd || die
-
- dodir /usr/share
- mv "${ED}"/usr/man "${ED}"/usr/share || die
- dodir /usr/share/doc/${PF}
- mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
-
- dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
- [[ ${PV} == 9999 ]] || dodoc FAQ
-}
-
-pkg_postinst() {
- einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'"
- einfo "due to a name conflict with net-dns/nsd. For details"
- einfo "please refer to https://bugs.gentoo.org/544488."
- einfo
- einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'"
- einfo "due to a name conflict with net-misc/eventd. For details"
- einfo "please refer to https://bugs.gentoo.org/632170."
-}
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 87090536fa17..7cad03095d25 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -61,11 +61,6 @@ gnome-base/gnome-vfs
# x11-libs/gtkglext is in the process of being removed, tracker bug #698950
x11-libs/gtkglext
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-02-22)
-# virtual/libffi has only one dev-libs/libffi provider. Use that instead.
-# bug #699796.
-virtual/libffi
-
# Zac Medico <zmedico@gentoo.org> (2019-12-06)
# These golang libraries should be vendored either by upstream or via
# the EGO_VENDOR variable.
diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild
deleted file mode 100644
index 476d24f1b96c..000000000000
--- a/virtual/libffi/libffi-3.3_rc0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The purpose of this ebuild is to provide quick fallback if and when we need to
-# switch back to internal copy of libffi from sys-devel/gcc.
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="A virtual for the Foreign Function Interface implementation"
-SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]"
diff --git a/virtual/libffi/metadata.xml b/virtual/libffi/metadata.xml
deleted file mode 100644
index 901305a7b923..000000000000
--- a/virtual/libffi/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>toolchain@gentoo.org</email>
- <name>Gentoo Toolchain Project</name>
- </maintainer>
- <stabilize-allarches/>
-</pkgmetadata>