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.";
+}
