gentoo resync : 18.03.2018

5 files changed, 6 insertions, 322 deletions

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index e396c3c3a94c..9cad05a1ef40 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,8 +1,6 @@
 DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf
 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895
 DIST mico-9999-gentoo-patches-20170529.tar.xz 16716 BLAKE2B 61aac1cc26031ca2c515a325ffc9dd28871e5a2e42e0d1367ccc619f04a6598d32241afc69e1c89f562bdd0e9ed5f0b217c611e3eeb7b0556fe20234bc20e98a SHA512 33361ab7a40fe897a48bf69fb33ffc3afa3da224a1589cfd7c4660deb00dcb9dd76dd2bc84ed968db6dd8a9e22aa493bb4b78713606675b6021f081eb56deb10
-EBUILD mico-2.3.13-r10.ebuild 4590 BLAKE2B 2a772ab0eb5f5b4959c42b3b1e59679f0dcb53570e2785c86f63806346581ed87c95f825d7c21d758b908e242ed7a6df382a0742f332b487088fdb796d6ff452 SHA512 0ecfb9573f3970b755aa4aca9030e1837abd3661cc71add09fd7b8bf5430a5453adf857b83ce15637e0d5a1101e3f74f653f75833f8e8110140c09a55229ac60
-EBUILD mico-2.3.13-r8.ebuild 3970 BLAKE2B c600352a4d7c14751f251bbdb636bfca9ba0d58bc2e78b9eb896ac0312d4c38897671b538fe68a6d9765de1d1959b733128e02baf277980ff5bbdff00f42d2c4 SHA512 86f9edc2281fdeb190fc71ee315acd569364d18ff4b64647e552f400f030086e27262e13013403caf49c14dd410d0f5137b4b832177c49b29a25ff082a9022e0
-EBUILD mico-2.3.13-r9.ebuild 4304 BLAKE2B 240be780afdde310ff896a10486fca9edd8692bf906d2b72b41204794c88a70ac7db0d078e565a9b560c326f67429949bfbb52b180e070374f4fe0d631eb73bd SHA512 2c7de23f01b8789b55e7df548c351cb48bf8b04675b192828ad442df8fc13fe22dc72500947001df695d2f302c347a3d6bf7b83c1c9fbd0ee95c95c7525a5100
-EBUILD mico-9999.ebuild 4440 BLAKE2B 6d51f8f23a35d3cee0292e681e301d0a3f10bdbae283f75e74d1eeda3679ee1238f6de08c62082546b2c35d62884118917f1e280e9cdc9ca1276f40403858cef SHA512 ee384e476d508d2b1f8d15288dc8a18f15aa532ac84c603533f643741b9de11a6b516f051d4b1c127b40b5b24fff46b8cb977a78b4b667ba7a6f3f4ed2d5b2ef
+EBUILD mico-2.3.13-r11.ebuild 4198 BLAKE2B f7f0db6a8bd9c0cacbb264cc6b6c2298a879f096df2e61c9e2a32d6e02c2f4e753143d1ddcdede5ca09581ab02b8c693c0aea9f9b611d95dc8167cceed43e55a SHA512 2beafa375e6610bcd29de467df8d260ab6fd3a7e311b6cd5befea2b4ef0b68a544a54b7c3a253ff4cda83c8be65ca4b914cf42fa554a1423bded1e9bae4a6893
+EBUILD mico-9999.ebuild 4048 BLAKE2B e378cdd859ac471c10b7932a914a732a9ed5c5e9bddbe6d0c5521b1b68371f9b3da000893f27ca8c0195f509b0f79ee338792ac0adde449b06e0a4d4de1c0e26 SHA512 bfaff0f2e90998d2d3411a816ec12467530613db2d83e7b0797a64fd93b9acc88b1c0127677b0f407aa9bf630e8c19198e8c6b79e3ecc60ec631c8ef87b62d29
 MISC metadata.xml 631 BLAKE2B bb0a1ee82b5b74160096ad9652a933f25c51f192ff30b3ae18d477aacff13a1021aa959e238b9103957ddff622b40f4ec8269b35b114d2325e3f75f90891c580 SHA512 111d8d30478b2647475b075f3c16f49b14be2bbde9e55b0b9efde42c0eaa8da128dd6801a914a898a8500d705d034d50ad05f7b41da5ec644f3c1bad12f21840
diff --git a/net-misc/mico/mico-2.3.13-r10.ebuild b/net-misc/mico/mico-2.3.13-r11.ebuild
index 024721e397f7..dea317a207b0 100644
--- a/net-misc/mico/mico-2.3.13-r10.ebuild
+++ b/net-misc/mico/mico-2.3.13-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.mico.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres qt4 ssl tcl threads X"
+IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
 # doesn't compile:
@@ -36,7 +36,6 @@ RESTRICT="test" #298101
 RDEPEND="
 	gtk?       ( x11-libs/gtk+:2 )
 	postgres?  ( dev-db/postgresql:* )
-	qt4?       ( dev-qt/qtgui:4[qt3support] )
 	ssl?       ( dev-libs/openssl:* )
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
@@ -64,11 +63,6 @@ src_prepare() {
 	# This assumes that the compiler (or -wrapper) uses
 	# gcc flag '-mminimal-toc' for compilation.
 	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
-
-	if use qt4; then
-		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
-			die "cannot update to use Qt3Support of qt4"
-	fi
 }
 
 src_configure() {
@@ -88,9 +82,6 @@ src_configure() {
 	# to disable openssl utilization seems to override the configure check.
 	use ssl || export ac_cv_lib_ssl_open=no
 
-	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
-	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
-
 	local myconf=
 	myconf() {
 		myconf="${myconf} $*"
@@ -104,7 +95,6 @@ src_configure() {
 	# This applies to: gtk, pgsql, qt, tcl, bluetooth.
 	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
 	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
-	myconf --with-qt=$(   use qt4      && echo "${EPREFIX}"/usr)
 	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
 	# bluetooth and wireless both don't compile cleanly
 	myconf --with-bluetooth=''
diff --git a/net-misc/mico/mico-2.3.13-r8.ebuild b/net-misc/mico/mico-2.3.13-r8.ebuild
deleted file mode 100644
index ec8a7b7a5d77..000000000000
--- a/net-misc/mico/mico-2.3.13-r8.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs autotools
-
-PATCH_VER=20170529
-
-if [[ ${PV} == 9999 ]]; then
-	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
-	inherit darcs
-	SRC_URI=
-else
-	SRC_URI="http://www.mico.org/${P}.tar.gz"
-fi
-
-if [[ -n ${PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
-	PATCHES=${WORKDIR}/patches
-else
-	PATCHES=
-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"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres qt4 ssl tcl threads X"
-RESTRICT="test" #298101
-
-# doesn't compile:
-#   bluetooth? ( net-wireless/bluez )
-
-RDEPEND="
-	gtk?       ( x11-libs/gtk+:2 )
-	postgres?  ( dev-db/postgresql:* )
-	qt4?       ( dev-qt/qtgui:4[qt3support] )
-	ssl?       ( dev-libs/openssl:* )
-	tcl?       ( dev-lang/tcl:0 )
-	X?         ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.2
-	>=sys-devel/bison-1.22
-"
-
-if [[ ${PV} == 9999 ]]; then
-	src_unpack() {
-		darcs_src_unpack
-		default
-	}
-else
-	S=${WORKDIR}/${PN}
-fi
-
-src_prepare() {
-	default
-
-	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
-
-	if use qt4; then
-		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
-			die "cannot update to use Qt3Support of qt4"
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	if use gtk && [[ -n ${PATCH_VER} ]]; then
-		# need gtk-1 wrapper for gtk-2
-		export PATH="${WORKDIR}"/helpers:${PATH}
-	fi
-
-	# 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
-
-	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
-	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
-
-	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: gtk, pgsql, qt, tcl, bluetooth.
-	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
-	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
-	myconf --with-qt=$(   use qt4      && 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)
-
-	# 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
-
-	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 FAQ README* ROADMAP TODO VERSION WTODO
-}
diff --git a/net-misc/mico/mico-2.3.13-r9.ebuild b/net-misc/mico/mico-2.3.13-r9.ebuild
deleted file mode 100644
index 08b8567e5dd8..000000000000
--- a/net-misc/mico/mico-2.3.13-r9.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs autotools
-
-PATCH_VER=20170529
-
-if [[ ${PV} == 9999 ]]; then
-	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
-	inherit darcs
-	SRC_URI=
-else
-	SRC_URI="http://www.mico.org/${P}.tar.gz"
-fi
-
-if [[ -n ${PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
-	PATCHES=${WORKDIR}/patches
-else
-	PATCHES=
-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"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres qt4 ssl tcl threads X"
-RESTRICT="test" #298101
-
-# doesn't compile:
-#   bluetooth? ( net-wireless/bluez )
-
-RDEPEND="
-	gtk?       ( x11-libs/gtk+:2 )
-	postgres?  ( dev-db/postgresql:* )
-	qt4?       ( dev-qt/qtgui:4[qt3support] )
-	ssl?       ( dev-libs/openssl:* )
-	tcl?       ( dev-lang/tcl:0 )
-	X?         ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.2
-	>=sys-devel/bison-1.22
-"
-
-if [[ ${PV} == 9999 ]]; then
-	src_unpack() {
-		darcs_src_unpack
-		default
-	}
-else
-	S=${WORKDIR}/${PN}
-fi
-
-src_prepare() {
-	default
-
-	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
-
-	if use qt4; then
-		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
-			die "cannot update to use Qt3Support of qt4"
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	if use gtk && [[ -n ${PATCH_VER} ]]; then
-		# need gtk-1 wrapper for gtk-2
-		export PATH="${WORKDIR}"/helpers:${PATH}
-	fi
-
-	# 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
-
-	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
-	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
-
-	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: gtk, pgsql, qt, tcl, bluetooth.
-	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
-	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
-	myconf --with-qt=$(   use qt4      && 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)
-
-	# 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
-
-	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 FAQ README* ROADMAP TODO VERSION WTODO
-}
-
-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."
-}
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 7012727c9d66..a103d157da69 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.mico.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk postgres qt4 ssl tcl threads X"
+IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
 # doesn't compile:
@@ -36,7 +36,6 @@ RESTRICT="test" #298101
 RDEPEND="
 	gtk?       ( x11-libs/gtk+:2 )
 	postgres?  ( dev-db/postgresql:* )
-	qt4?       ( dev-qt/qtgui:4[qt3support] )
 	ssl?       ( dev-libs/openssl:* )
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
@@ -65,11 +64,6 @@ src_prepare() {
 	# This assumes that the compiler (or -wrapper) uses
 	# gcc flag '-mminimal-toc' for compilation.
 	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
-
-	if use qt4; then
-		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
-			die "cannot update to use Qt3Support of qt4"
-	fi
 }
 
 src_configure() {
@@ -84,9 +78,6 @@ src_configure() {
 	# to disable openssl utilization seems to override the configure check.
 	use ssl || export ac_cv_lib_ssl_open=no
 
-	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
-	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
-
 	local myconf=
 	myconf() {
 		myconf="${myconf} $*"
@@ -99,7 +90,6 @@ src_configure() {
 	# the value needs to be empty instead.
 	# This applies to: pgsql, qt, tcl, bluetooth.
 	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
-	myconf --with-qt=$(   use qt4      && echo "${EPREFIX}"/usr)
 	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
 	# bluetooth and wireless both don't compile cleanly
 	myconf --with-bluetooth=''