[gentoo-commits] repo/gentoo:master commit in: net-misc/mico/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2018-03-15 22:27 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2018-03-15 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4f0542a75e5547f095b40af18c9a8c591ec75db6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 18:23:11 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 22:27:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0542a7

net-misc/mico: Drop old

Closes: https://bugs.gentoo.org/646744
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/mico/mico-2.3.13-r10.ebuild | 159 -----------------------------------
 net-misc/mico/mico-2.3.13-r8.ebuild  | 142 -------------------------------
 net-misc/mico/mico-2.3.13-r9.ebuild  | 152 ---------------------------------
 3 files changed, 453 deletions(-)

diff --git a/net-misc/mico/mico-2.3.13-r10.ebuild b/net-misc/mico/mico-2.3.13-r10.ebuild
deleted file mode 100644
index 024721e397f..00000000000
--- a/net-misc/mico/mico-2.3.13-r10.ebuild
+++ /dev/null
@@ -1,159 +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
-
-	# 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 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."
-	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/net-misc/mico/mico-2.3.13-r8.ebuild b/net-misc/mico/mico-2.3.13-r8.ebuild
deleted file mode 100644
index ec8a7b7a5d7..00000000000
--- 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 08b8567e5dd..00000000000
--- 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."
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2023-05-29 18:21 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2023-05-29 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     6b46d832f1158a246b4565e5223b56b4bff94ec1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 16:57:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 29 18:19:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b46d832

net-misc/mico: drop dead prefix targets

The removal was already done, so this is just cleanup afterwards.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/mico/mico-2.3.13-r14.ebuild | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild
index 29c244d4c5be..637035595df9 100644
--- a/net-misc/mico/mico-2.3.13-r14.ebuild
+++ b/net-misc/mico/mico-2.3.13-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -85,18 +85,6 @@ src_configure() {
 	# 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}
 }
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2021-07-25  1:29 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-07-25  1:29 UTC (permalink / raw
  To: gentoo-commits

commit:     547ee6961b773fc74f8f353dd06b65e81608a0a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 01:27:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 01:27:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547ee696

net-misc/mico: drop obsolete references to darcs.eclass

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/mico/mico-2.3.13-r13.ebuild | 35 +++++++++++------------------------
 net-misc/mico/mico-2.3.13-r14.ebuild | 35 +++++++++++------------------------
 2 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/net-misc/mico/mico-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild
index 52c03727f64..324ead110f2 100644
--- a/net-misc/mico/mico-2.3.13-r13.ebuild
+++ b/net-misc/mico/mico-2.3.13-r13.ebuild
@@ -5,24 +5,17 @@ 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/"
+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
+"
+S="${WORKDIR}"/${PN}
+
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
@@ -42,15 +35,9 @@ BDEPEND="
 	>=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
+PATCHES=(
+	"${DISTDIR}"/${P}-gentoo-${PR}.patch
+)
 
 src_prepare() {
 	default
@@ -132,7 +119,7 @@ src_install() {
 	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
 
 	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
-	[[ ${PV} == 9999 ]] || dodoc FAQ
+	dodoc FAQ
 }
 
 pkg_postinst() {

diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild
index 52c03727f64..324ead110f2 100644
--- a/net-misc/mico/mico-2.3.13-r14.ebuild
+++ b/net-misc/mico/mico-2.3.13-r14.ebuild
@@ -5,24 +5,17 @@ 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/"
+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
+"
+S="${WORKDIR}"/${PN}
+
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
@@ -42,15 +35,9 @@ BDEPEND="
 	>=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
+PATCHES=(
+	"${DISTDIR}"/${P}-gentoo-${PR}.patch
+)
 
 src_prepare() {
 	default
@@ -132,7 +119,7 @@ src_install() {
 	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
 
 	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
-	[[ ${PV} == 9999 ]] || dodoc FAQ
+	dodoc FAQ
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2021-06-20  9:12 David Seifert
  0 siblings, 0 replies; 20+ messages in thread
From: David Seifert @ 2021-06-20  9:12 UTC (permalink / raw
  To: gentoo-commits

commit:     fb387193e6575f8a265fbe0cc491933575ef5975
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 09:12:27 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 09:12:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb387193

net-misc/mico: drop 9999

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-misc/mico/mico-9999.ebuild | 146 -----------------------------------------
 1 file changed, 146 deletions(-)

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
deleted file mode 100644
index 52c03727f64..00000000000
--- 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."
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2021-04-23  6:53 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2021-04-23  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     e14f7e33e491624de8a91a5a6b443c6fc90787c6
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 06:27:50 2021 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 06:45:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14f7e33

net-misc/mico: m-needed

Also, mirror for dead upstream has moved.

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 net-misc/mico/metadata.xml           | 5 +----
 net-misc/mico/mico-2.3.13-r13.ebuild | 6 +++---
 net-misc/mico/mico-2.3.13-r14.ebuild | 6 +++---
 net-misc/mico/mico-9999.ebuild       | 6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/net-misc/mico/metadata.xml b/net-misc/mico/metadata.xml
index 89b3f821e9c..47e27a9250a 100644
--- a/net-misc/mico/metadata.xml
+++ b/net-misc/mico/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		MICO is a mature, secure, robust, fully standards-compliant
 		implementation of the CORBA standard. It is available as GNU open source

diff --git a/net-misc/mico/mico-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild
index 0692096b594..52c03727f64 100644
--- a/net-misc/mico/mico-2.3.13-r13.ebuild
+++ b/net-misc/mico/mico-2.3.13-r13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="
 		http://www.mico.org/${P}.tar.gz
-		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
+		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"
@@ -44,7 +44,7 @@ BDEPEND="
 
 if [[ ${PV} == 9999 ]]; then
 	src_unpack() {
-		wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
+		wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die
 		darcs_src_unpack
 		default
 	}

diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild
index 0692096b594..52c03727f64 100644
--- a/net-misc/mico/mico-2.3.13-r14.ebuild
+++ b/net-misc/mico/mico-2.3.13-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="
 		http://www.mico.org/${P}.tar.gz
-		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
+		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"
@@ -44,7 +44,7 @@ BDEPEND="
 
 if [[ ${PV} == 9999 ]]; then
 	src_unpack() {
-		wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
+		wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die
 		darcs_src_unpack
 		default
 	}

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 0692096b594..52c03727f64 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="
 		http://www.mico.org/${P}.tar.gz
-		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
+		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"
@@ -44,7 +44,7 @@ BDEPEND="
 
 if [[ ${PV} == 9999 ]]; then
 	src_unpack() {
-		wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
+		wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die
 		darcs_src_unpack
 		default
 	}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2020-12-27 17:57 Fabian Groffen
  0 siblings, 0 replies; 20+ messages in thread
From: Fabian Groffen @ 2020-12-27 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     776024b1a5758f7b367d99c76790a3d36ce8c839
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 17:54:33 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 17:56:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776024b1

net-misc/mico: drop ppc-aix m68k-mint

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 net-misc/mico/mico-2.3.13-r13.ebuild | 4 ++--
 net-misc/mico/mico-2.3.13-r14.ebuild | 4 ++--
 net-misc/mico/mico-9999.ebuild       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/mico/mico-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild
index 4b4032d1f82..0692096b594 100644
--- a/net-misc/mico/mico-2.3.13-r13.ebuild
+++ b/net-misc/mico/mico-2.3.13-r13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ else
 		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
 	"
 	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
-	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
+	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"

diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild
index 4b4032d1f82..0692096b594 100644
--- a/net-misc/mico/mico-2.3.13-r14.ebuild
+++ b/net-misc/mico/mico-2.3.13-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ else
 		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
 	"
 	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
-	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
+	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"

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 4b4032d1f82..0692096b594 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ else
 		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
 	"
 	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
-	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
+	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"


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2019-06-12 11:19 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2019-06-12 11:19 UTC (permalink / raw
  To: gentoo-commits

commit:     1699becd38e8f901441b8bbc30bf17dffb03202c
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 11:18:22 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 11:18:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1699becd

net-misc/mico: revbump, C++ ostream operators with ADL

Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 net-misc/mico/Manifest               |   1 +
 net-misc/mico/mico-2.3.13-r14.ebuild | 146 +++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 26f32e44648..86d2e815a72 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,2 +1,3 @@
 DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906
+DIST mico-2.3.13-gentoo-r14.patch 136291 BLAKE2B 3416fe0fc2e0b9243d22c9cf6a0dffbf14c99846d1b064b3df6496c2d1b9021de0268d0543f566d13425d4fef29626829359deb133ce678d299627f93b0461de SHA512 3ec284442ac00bf429f633dddcaae46a83b720045bc93a177a609255957956aaccb188b0e858ac88b3d8b0c9be081501dcffabd86965b1a4b30a07d45aab0850
 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895

diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild
new file mode 100644
index 00000000000..4b4032d1f82
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r14.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 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/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
+	"
+	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~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/haubi/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."
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2019-06-06 16:49 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2019-06-06 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     bf38294d4901f60feb6470577f7cbe2e500c169b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 19:06:06 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 16:49:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf38294d

net-misc/mico: Drop 2.3.13-r12

Broken by >=OpenSSL-1.1.
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-misc/mico/Manifest               |   1 -
 net-misc/mico/mico-2.3.13-r12.ebuild | 149 -----------------------------------
 2 files changed, 150 deletions(-)

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 498feb5d815..26f32e44648 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,3 +1,2 @@
-DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf
 DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906
 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895

diff --git a/net-misc/mico/mico-2.3.13-r12.ebuild b/net-misc/mico/mico-2.3.13-r12.ebuild
deleted file mode 100644
index 97281d44bfd..00000000000
--- a/net-misc/mico/mico-2.3.13-r12.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 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 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}
-	>=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
-}
-
-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
-
-	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-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
-
-	# 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 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."
-	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."
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2019-06-04 11:35 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2019-06-04 11:35 UTC (permalink / raw
  To: gentoo-commits

commit:     1dfb644e272935bc447ad03fab0c6e451a448188
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 11:33:01 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 11:34:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfb644e

net-misc/mico: revbump, for openssl-1.1 (#674098)

Also, fix some quality compiler warnings, and use -fno-strict-aliasing
compiler flag even with more recent (hence unknown) compiler versions.

Closes: https://bugs.gentoo.org/674098
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 net-misc/mico/Manifest                                     |  1 +
 net-misc/mico/{mico-9999.ebuild => mico-2.3.13-r13.ebuild} | 13 +++++++------
 net-misc/mico/mico-9999.ebuild                             | 13 +++++++------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 8214f2d9dbd..498feb5d815 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,2 +1,3 @@
 DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf
+DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906
 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild
similarity index 89%
copy from net-misc/mico/mico-9999.ebuild
copy to net-misc/mico/mico-2.3.13-r13.ebuild
index 45fcd9ba749..4b4032d1f82 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-2.3.13-r13.ebuild
@@ -9,20 +9,20 @@ if [[ ${PV} == 9999 ]]; then
 	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
 	inherit darcs
 	SRC_URI=""
+	PATCHES="${WORKDIR}/${P}-gentoo.patch"
 else
-	PATCH_VER=20170529
 	SRC_URI="
 		http://www.mico.org/${P}.tar.gz
-		https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz
+		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
 	"
+	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 fi
-PATCHES="${WORKDIR}/patches"
 
 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=""
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
@@ -44,8 +44,7 @@ BDEPEND="
 
 if [[ ${PV} == 9999 ]]; then
 	src_unpack() {
-		mkdir patches || die
-		wget -O patches/gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
+		wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
 		darcs_src_unpack
 		default
 	}
@@ -67,6 +66,7 @@ src_prepare() {
 
 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.
@@ -132,6 +132,7 @@ src_install() {
 	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() {

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 45fcd9ba749..4b4032d1f82 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -9,20 +9,20 @@ if [[ ${PV} == 9999 ]]; then
 	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
 	inherit darcs
 	SRC_URI=""
+	PATCHES="${WORKDIR}/${P}-gentoo.patch"
 else
-	PATCH_VER=20170529
 	SRC_URI="
 		http://www.mico.org/${P}.tar.gz
-		https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz
+		https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
 	"
+	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 fi
-PATCHES="${WORKDIR}/patches"
 
 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=""
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
@@ -44,8 +44,7 @@ BDEPEND="
 
 if [[ ${PV} == 9999 ]]; then
 	src_unpack() {
-		mkdir patches || die
-		wget -O patches/gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
+		wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
 		darcs_src_unpack
 		default
 	}
@@ -67,6 +66,7 @@ src_prepare() {
 
 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.
@@ -132,6 +132,7 @@ src_install() {
 	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() {


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2019-06-03 16:11 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2019-06-03 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     0b0e330d499f11649c0332bc7c41b6396e938486
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 15:31:28 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 16:11:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0e330d

net-misc/mico: from github fetch gentoo live patch in src_unpack

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 net-misc/mico/Manifest         | 1 -
 net-misc/mico/mico-9999.ebuild | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 99d1e54c460..8214f2d9dbd 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,3 +1,2 @@
 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.patch 66675 BLAKE2B c403d2e6fe3b3e9a77f7a4d73b6152b73ff3eea76e35e16f705ce8da5935fdc4a0fd4b1136437cac5a0fb0b81f00f0461cba0d45e9cbf0d88f3ffc5faf1e7967 SHA512 2d709b90cc8c8873eca8df94acbb24cf484305dbadc8d913dc58912349677ded633e92faac4944076547cb064329d7a3dfc79a43ce9ff15b238d989f2bdd4a6d

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index ba56c4b4614..45fcd9ba749 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -8,16 +8,15 @@ inherit flag-o-matic toolchain-funcs autotools
 if [[ ${PV} == 9999 ]]; then
 	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
 	inherit darcs
-	SRC_URI="https://github.com/haubi/mico/compare/gentoo.patch -> ${P}-gentoo.patch"
-	PATCHES="${DISTDIR}/${P}-gentoo.patch"
+	SRC_URI=""
 else
 	PATCH_VER=20170529
 	SRC_URI="
 		http://www.mico.org/${P}.tar.gz
 		https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz
 	"
-	PATCHES="${WORKDIR}/patches"
 fi
+PATCHES="${WORKDIR}/patches"
 
 DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
 HOMEPAGE="http://www.mico.org/"
@@ -45,6 +44,8 @@ BDEPEND="
 
 if [[ ${PV} == 9999 ]]; then
 	src_unpack() {
+		mkdir patches || die
+		wget -O patches/gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die
 		darcs_src_unpack
 		default
 	}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2019-05-29 10:03 Michał Górny
  0 siblings, 0 replies; 20+ messages in thread
From: Michał Górny @ 2019-05-29 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d49a924ea6382ae5e3cda3d1f9a0896885b59417
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 18:53:07 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 29 10:03:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49a924e

net-misc/mico: [QA] Fix openssl dep to use :0=

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-misc/mico/{mico-2.3.13-r11.ebuild => mico-2.3.13-r12.ebuild} | 2 +-
 net-misc/mico/mico-9999.ebuild                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/mico/mico-2.3.13-r11.ebuild b/net-misc/mico/mico-2.3.13-r12.ebuild
similarity index 99%
rename from net-misc/mico/mico-2.3.13-r11.ebuild
rename to net-misc/mico/mico-2.3.13-r12.ebuild
index dea317a207b..97281d44bfd 100644
--- a/net-misc/mico/mico-2.3.13-r11.ebuild
+++ b/net-misc/mico/mico-2.3.13-r12.ebuild
@@ -36,7 +36,7 @@ RESTRICT="test" #298101
 RDEPEND="
 	gtk?       ( x11-libs/gtk+:2 )
 	postgres?  ( dev-db/postgresql:* )
-	ssl?       ( dev-libs/openssl:* )
+	ssl?       ( dev-libs/openssl:0= )
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
 "

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 9c222a3bdf8..ba56c4b4614 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test" #298101
 RDEPEND="
 	gtk?       ( x11-libs/gtk+:2 )
 	postgres?  ( dev-db/postgresql:* )
-	ssl?       ( dev-libs/openssl:* )
+	ssl?       ( dev-libs/openssl:0= )
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
 "


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2019-05-29  7:38 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2019-05-29  7:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f5cad591894deb516cc2e5998c4021084204a575
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 07:35:57 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed May 29 07:37:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cad591

net-misc/mico: flex+bison is BDEPEND (EAPI 7)

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 net-misc/mico/mico-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 4938fe8397b..9c222a3bdf8 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	X?         ( x11-libs/libXt )
 "
 DEPEND="${RDEPEND}"
-DEPEND="
+BDEPEND="
 	>=sys-devel/flex-2.5.2
 	>=sys-devel/bison-1.22
 "


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2019-05-28  8:33 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2019-05-28  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     6ca8102e790cd6eb7bf992f5fc8bdcf5ab685092
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 08:32:44 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue May 28 08:33:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca8102e

net-misc/mico-9999: EAPI 7, live patch from github

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 net-misc/mico/Manifest         |  2 +-
 net-misc/mico/mico-9999.ebuild | 38 ++++++++++++++++++--------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 0622695d7d8..99d1e54c460 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,3 +1,3 @@
 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
+DIST mico-9999-gentoo.patch 66675 BLAKE2B c403d2e6fe3b3e9a77f7a4d73b6152b73ff3eea76e35e16f705ce8da5935fdc4a0fd4b1136437cac5a0fb0b81f00f0461cba0d45e9cbf0d88f3ffc5faf1e7967 SHA512 2d709b90cc8c8873eca8df94acbb24cf484305dbadc8d913dc58912349677ded633e92faac4944076547cb064329d7a3dfc79a43ce9ff15b238d989f2bdd4a6d

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 596262c42df..4938fe8397b 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit flag-o-matic toolchain-funcs autotools
 
-PATCH_VER=20170529
-
 if [[ ${PV} == 9999 ]]; then
 	EDARCS_REPOSITORY="http://www.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
+	SRC_URI="https://github.com/haubi/mico/compare/gentoo.patch -> ${P}-gentoo.patch"
+	PATCHES="${DISTDIR}/${P}-gentoo.patch"
 else
-	PATCHES=
+	PATCH_VER=20170529
+	SRC_URI="
+		http://www.mico.org/${P}.tar.gz
+		https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz
+	"
+	PATCHES="${WORKDIR}/patches"
 fi
 
 DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
@@ -40,7 +37,8 @@ RDEPEND="
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+DEPEND="
 	>=sys-devel/flex-2.5.2
 	>=sys-devel/bison-1.22
 "
@@ -115,22 +113,22 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
+	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
+		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
+	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
+	mv "${ED}"/usr/bin/{,mico-}eventd || die
 
 	dodir /usr/share
-	mv "${ED}"usr/man "${ED}"usr/share || die
+	mv "${ED}"/usr/man "${ED}"/usr/share || die
 	dodir /usr/share/doc/${PF}
-	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
 
 	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2019-05-17 12:01 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2019-05-17 12:01 UTC (permalink / raw
  To: gentoo-commits

commit:     3268e083f8a81bd0fec23339104909419282929d
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 12:00:35 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri May 17 12:01:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3268e083

net-misc/mico: darcs repo url needs www prefix

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 net-misc/mico/mico-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index a103d157da6..596262c42df 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ inherit flag-o-matic toolchain-funcs autotools
 PATCH_VER=20170529
 
 if [[ ${PV} == 9999 ]]; then
-	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
+	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
 	inherit darcs
 	SRC_URI=
 else


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2018-03-17  9:51 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2018-03-17  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5c873cfb18e9c680bbff83d6cc35a724fa4b75d2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 09:50:49 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 09:51:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c873cfb

net-misc/mico: Drop USE=qt4 from live ebuild as well

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/mico/mico-9999.ebuild | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 7012727c9d6..a103d157da6 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=''


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2018-03-15 22:27 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2018-03-15 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     a61dcef083698c8e9be99ac91a95206be33b6281
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 18:22:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 22:27:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61dcef0

net-misc/mico: Drop USE=qt4

Closes: https://bugs.gentoo.org/639260
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/mico/mico-2.3.13-r11.ebuild | 149 +++++++++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)

diff --git a/net-misc/mico/mico-2.3.13-r11.ebuild b/net-misc/mico/mico-2.3.13-r11.ebuild
new file mode 100644
index 00000000000..dea317a207b
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r11.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 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 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:* )
+	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
+}
+
+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
+
+	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-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
+
+	# 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 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."
+	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."
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2017-10-02 11:23 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2017-10-02 11:23 UTC (permalink / raw
  To: gentoo-commits

commit:     d63834bbdc7a999a0447f659d5aa9a9097556c8c
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  2 11:23:02 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Oct  2 11:23:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63834bb

net-misc/mico: avoid file collision with net-misc/eventd, bug#632170

Closes: https://bugs.gentoo.org/632170

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 .../{mico-9999.ebuild => mico-2.3.13-r10.ebuild}   | 22 ++++++++++++++++------
 net-misc/mico/mico-9999.ebuild                     |  7 +++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-2.3.13-r10.ebuild
similarity index 84%
copy from net-misc/mico/mico-9999.ebuild
copy to net-misc/mico/mico-2.3.13-r10.ebuild
index 7cf32aaacff..024721e397f 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-2.3.13-r10.ebuild
@@ -26,7 +26,7 @@ DESCRIPTION="A freely available and fully compliant implementation of the CORBA
 HOMEPAGE="http://www.mico.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS=""
+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
 
@@ -58,7 +58,6 @@ fi
 src_prepare() {
 	default
 
-	mv configure.in configure.ac || die #426262
 	eautoreconf
 
 	# cannot use big TOC (AIX only), gdb doesn't like it.
@@ -75,6 +74,11 @@ src_prepare() {
 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'.
@@ -97,7 +101,8 @@ src_configure() {
 
 	# '--without-*' or '--with-*=no' does not disable some features,
 	# the value needs to be empty instead.
-	# This applies to: pgsql, qt, tcl, bluetooth.
+	# 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)
@@ -106,8 +111,6 @@ src_configure() {
 	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
@@ -134,16 +137,23 @@ src_install() {
 	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
+	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."
+	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/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 7cf32aaacff..7012727c9d6 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -134,6 +134,9 @@ src_install() {
 	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}
@@ -146,4 +149,8 @@ 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."
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2017-06-16 19:57 Andreas Hüttel
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Hüttel @ 2017-06-16 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     6e6d71616267a5dc7b26609ce9fca3b8ad718511
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 19:54:00 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 19:54:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e6d7161

net-misc/mico: Drop old, bug 605728

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-misc/mico/Manifest              |   1 -
 net-misc/mico/mico-2.3.13-r7.ebuild | 125 ------------------------------------
 2 files changed, 126 deletions(-)

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 2c31ae67614..2d8ef8b81ab 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,4 +1,3 @@
-DIST mico-2.3.13-gentoo-patches-0.3.tar.bz2 9547 SHA256 4d76e7e696ac4af60dc40ecc81d3a142cbec410c2e1b9155270a7865e71afca4 SHA512 1e22066313f3af495678094a5b83f502b080e645b7379bd6b860d71f69b7a02db19047d3f8433b04d3d1f0a2b41e56e480f217041381027638d2b84a373bef5d WHIRLPOOL fbfabcaafee1ca286697a3ae37c24f8451283683e1f1787f8df3c267b8e4b8da69c79817b82bec810852069e021f541db3f05f76feec6256243bb2ad70a41788
 DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 SHA256 9d616c90f1ef4db44709e393fd2ab74d1e17f7e65541900c3735c312376de681 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf WHIRLPOOL 52494f75a92cfd3e06baf5074b17ce8776f120bb38c63ffea09be78ba95735d629098c2bc34a2289ff5c2ed383d697f450530b76b9f73919dcdacf8072765773
 DIST mico-2.3.13.tar.gz 3269814 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69 SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 WHIRLPOOL e8f5b92502a012e4f316ae341a25a0c24def7718f7a85fed7e24de5298d593b1a2af2fcb21e89d857e6da65d6b0765108eb3f77e820874d98047127d07734389
 DIST mico-9999-gentoo-patches-20170529.tar.xz 16716 SHA256 e5271dd2c8742b19fd89abb014bd02fa1a1a1acd17d1cf740f61127f0aafd367 SHA512 33361ab7a40fe897a48bf69fb33ffc3afa3da224a1589cfd7c4660deb00dcb9dd76dd2bc84ed968db6dd8a9e22aa493bb4b78713606675b6021f081eb56deb10 WHIRLPOOL 72b5777543e5d7f48cf0b64d4134fd33d6f29c3889281ccdecb9306d846af2f965138dd8093459c7bdb8b26a335c0bce3fab2d10282e59f6f441a45ac79742cf

diff --git a/net-misc/mico/mico-2.3.13-r7.ebuild b/net-misc/mico/mico-2.3.13-r7.ebuild
deleted file mode 100644
index 39931615587..00000000000
--- a/net-misc/mico/mico-2.3.13-r7.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs autotools
-
-DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
-HOMEPAGE="http://www.mico.org/"
-SRC_URI="http://www.mico.org/${P}.tar.gz"
-
-PATCH_VER=0.3
-
-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
-
-[[ -z ${PATCH_VER} ]] || \
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.bz2"
-
-# 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
-"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
-
-	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
-
-	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; 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=: || die "install failed"
-	if [[ $(get_libdir) != lib ]]; then #500744
-		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
-	fi
-
-	dodir /usr/share || die
-	mv "${ED}"usr/man "${ED}"usr/share || die
-	dodir /usr/share/doc/${PF} || die
-	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
-
-	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO || die
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2017-05-29 13:44 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2017-05-29 13:44 UTC (permalink / raw
  To: gentoo-commits

commit:     514b2eff38dccf12d64e421ec4c8cd34b76e3616
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 13:00:06 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon May 29 13:44:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514b2eff

net-misc/mico: add patch for gcc-6 (bug#594806)

Thanks to Peter Levine for providing the link to a patch in GH PR #4788.

Closes: https://github.com/gentoo/gentoo/pull/4788

Package-Manager: portage-2.3.5

 net-misc/mico/Manifest                             |  3 +-
 .../{mico-9999.ebuild => mico-2.3.13-r8.ebuild}    | 56 ++++++++++++----------
 net-misc/mico/mico-9999.ebuild                     | 45 +++++++++--------
 3 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 77ce7c11525..2c31ae67614 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,3 +1,4 @@
 DIST mico-2.3.13-gentoo-patches-0.3.tar.bz2 9547 SHA256 4d76e7e696ac4af60dc40ecc81d3a142cbec410c2e1b9155270a7865e71afca4 SHA512 1e22066313f3af495678094a5b83f502b080e645b7379bd6b860d71f69b7a02db19047d3f8433b04d3d1f0a2b41e56e480f217041381027638d2b84a373bef5d WHIRLPOOL fbfabcaafee1ca286697a3ae37c24f8451283683e1f1787f8df3c267b8e4b8da69c79817b82bec810852069e021f541db3f05f76feec6256243bb2ad70a41788
+DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 SHA256 9d616c90f1ef4db44709e393fd2ab74d1e17f7e65541900c3735c312376de681 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf WHIRLPOOL 52494f75a92cfd3e06baf5074b17ce8776f120bb38c63ffea09be78ba95735d629098c2bc34a2289ff5c2ed383d697f450530b76b9f73919dcdacf8072765773
 DIST mico-2.3.13.tar.gz 3269814 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69 SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 WHIRLPOOL e8f5b92502a012e4f316ae341a25a0c24def7718f7a85fed7e24de5298d593b1a2af2fcb21e89d857e6da65d6b0765108eb3f77e820874d98047127d07734389
-DIST mico-9999-gentoo-patches-20120924.tar.bz2 11693 SHA256 054fb0347c67bcbff41b2fd42204c389f9c5fbd4d07fd014f2c356a428f72d32 SHA512 5a1a775c67494776094d228a02ff5546256f11c255dcda18b6fe7c08ac87d6d969540559c2876de571c2b1bf5b1fefa03ba3e6b6749c0589c725153463dc886a WHIRLPOOL 686e7600abb0b5e3f1247b446dc0240e33679a2da821cc8741fc0b7c86f4d289c1c7603c0fcd5dc47f19b7639b8ed0e011b265516c0eb0195a04e9780dba338d
+DIST mico-9999-gentoo-patches-20170529.tar.xz 16716 SHA256 e5271dd2c8742b19fd89abb014bd02fa1a1a1acd17d1cf740f61127f0aafd367 SHA512 33361ab7a40fe897a48bf69fb33ffc3afa3da224a1589cfd7c4660deb00dcb9dd76dd2bc84ed968db6dd8a9e22aa493bb4b78713606675b6021f081eb56deb10 WHIRLPOOL 72b5777543e5d7f48cf0b64d4134fd33d6f29c3889281ccdecb9306d846af2f965138dd8093459c7bdb8b26a335c0bce3fab2d10282e59f6f441a45ac79742cf

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-2.3.13-r8.ebuild
similarity index 75%
copy from net-misc/mico/mico-9999.ebuild
copy to net-misc/mico/mico-2.3.13-r8.ebuild
index 604b3b1abdc..ec8a7b7a5d7 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-2.3.13-r8.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI="6"
 
-inherit eutils flag-o-matic toolchain-funcs autotools
+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
 
-PATCH_VER=20120924
+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/"
-SRC_URI="http://www.mico.org/${P}.tar.gz"
-
-[[ ${PV} == 9999 ]] &&
-	SRC_URI=""
-
-[[ -n ${PATCH_VER} ]] &&
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.bz2"
-
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS=""
+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
 
@@ -33,9 +35,9 @@ RESTRICT="test" #298101
 
 RDEPEND="
 	gtk?       ( x11-libs/gtk+:2 )
-	postgres?  ( dev-db/postgresql )
+	postgres?  ( dev-db/postgresql:* )
 	qt4?       ( dev-qt/qtgui:4[qt3support] )
-	ssl?       ( dev-libs/openssl )
+	ssl?       ( dev-libs/openssl:* )
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
 "
@@ -49,17 +51,19 @@ if [[ ${PV} == 9999 ]]; then
 		darcs_src_unpack
 		default
 	}
+else
+	S=${WORKDIR}/${PN}
 fi
 
 src_prepare() {
-	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
+	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
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
 
 	if use qt4; then
 		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
@@ -70,6 +74,11 @@ src_prepare() {
 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'.
@@ -92,7 +101,8 @@ src_configure() {
 
 	# '--without-*' or '--with-*=no' does not disable some features,
 	# the value needs to be empty instead.
-	# This applies to: pgsql, qt, tcl, bluetooth.
+	# 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)
@@ -101,8 +111,6 @@ src_configure() {
 	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
@@ -120,15 +128,15 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=: || die "install failed"
+	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 || die
+	dodir /usr/share
 	mv "${ED}"usr/man "${ED}"usr/share || die
-	dodir /usr/share/doc/${PF} || 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 || die
+	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
 }

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 604b3b1abdc..f9bcd3c55f5 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI="6"
 
-inherit eutils flag-o-matic toolchain-funcs autotools
+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
 
-PATCH_VER=20120924
+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/"
-SRC_URI="http://www.mico.org/${P}.tar.gz"
-
-[[ ${PV} == 9999 ]] &&
-	SRC_URI=""
-
-[[ -n ${PATCH_VER} ]] &&
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.bz2"
-
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS=""
@@ -33,9 +35,9 @@ RESTRICT="test" #298101
 
 RDEPEND="
 	gtk?       ( x11-libs/gtk+:2 )
-	postgres?  ( dev-db/postgresql )
+	postgres?  ( dev-db/postgresql:* )
 	qt4?       ( dev-qt/qtgui:4[qt3support] )
-	ssl?       ( dev-libs/openssl )
+	ssl?       ( dev-libs/openssl:* )
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
 "
@@ -49,17 +51,20 @@ if [[ ${PV} == 9999 ]]; then
 		darcs_src_unpack
 		default
 	}
+else
+	S=${WORKDIR}/${PN}
 fi
 
 src_prepare() {
-	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
+	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
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
 
 	if use qt4; then
 		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
@@ -120,15 +125,15 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=: || die "install failed"
+	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 || die
+	dodir /usr/share
 	mv "${ED}"usr/man "${ED}"usr/share || die
-	dodir /usr/share/doc/${PF} || 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 || die
+	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/
@ 2017-05-29 13:44 Michael Haubenwallner
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Haubenwallner @ 2017-05-29 13:44 UTC (permalink / raw
  To: gentoo-commits

commit:     5a747320292fef3d6d93b1fc6b4e4dfd5d2e5605
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 13:40:18 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon May 29 13:44:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a747320

net-misc/mico: rename 'nsd' to 'mico-nsd', bug#544488

Package-Manager: portage-2.3.5

 .../{mico-9999.ebuild => mico-2.3.13-r9.ebuild}    | 25 ++++++++++++++++------
 net-misc/mico/mico-9999.ebuild                     | 10 +++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-2.3.13-r9.ebuild
similarity index 82%
copy from net-misc/mico/mico-9999.ebuild
copy to net-misc/mico/mico-2.3.13-r9.ebuild
index f9bcd3c55f5..08b8567e5dd 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-2.3.13-r9.ebuild
@@ -26,7 +26,7 @@ DESCRIPTION="A freely available and fully compliant implementation of the CORBA
 HOMEPAGE="http://www.mico.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS=""
+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
 
@@ -58,7 +58,6 @@ fi
 src_prepare() {
 	default
 
-	mv configure.in configure.ac || die #426262
 	eautoreconf
 
 	# cannot use big TOC (AIX only), gdb doesn't like it.
@@ -75,6 +74,11 @@ src_prepare() {
 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'.
@@ -97,7 +101,8 @@ src_configure() {
 
 	# '--without-*' or '--with-*=no' does not disable some features,
 	# the value needs to be empty instead.
-	# This applies to: pgsql, qt, tcl, bluetooth.
+	# 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)
@@ -106,8 +111,6 @@ src_configure() {
 	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
@@ -130,10 +133,20 @@ src_install() {
 		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 README* ROADMAP TODO VERSION WTODO
+	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 f9bcd3c55f5..7cf32aaacff 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -130,6 +130,10 @@ src_install() {
 		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}
@@ -137,3 +141,9 @@ src_install() {
 
 	dodoc BUGS CHANGES* CONVERT 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."
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2023-05-29 18:21 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-15 22:27 [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-05-29 18:21 Sam James
2021-07-25  1:29 Sam James
2021-06-20  9:12 David Seifert
2021-04-23  6:53 Michael Haubenwallner
2020-12-27 17:57 Fabian Groffen
2019-06-12 11:19 Michael Haubenwallner
2019-06-06 16:49 Andreas Sturmlechner
2019-06-04 11:35 Michael Haubenwallner
2019-06-03 16:11 Michael Haubenwallner
2019-05-29 10:03 Michał Górny
2019-05-29  7:38 Michael Haubenwallner
2019-05-28  8:33 Michael Haubenwallner
2019-05-17 12:01 Michael Haubenwallner
2018-03-17  9:51 Andreas Sturmlechner
2018-03-15 22:27 Andreas Sturmlechner
2017-10-02 11:23 Michael Haubenwallner
2017-06-16 19:57 Andreas Hüttel
2017-05-29 13:44 Michael Haubenwallner
2017-05-29 13:44 Michael Haubenwallner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox