From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB14A139694 for ; Mon, 29 May 2017 13:44:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02E68E0D35; Mon, 29 May 2017 13:44:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C283FE0E06 for ; Mon, 29 May 2017 13:44:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 665D43416E5 for ; Mon, 29 May 2017 13:44:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42AF17468 for ; Mon, 29 May 2017 13:44:30 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1496065441.5a747320292fef3d6d93b1fc6b4e4dfd5d2e5605.haubi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/mico/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/mico/mico-2.3.13-r9.ebuild net-misc/mico/mico-9999.ebuild X-VCS-Directories: net-misc/mico/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 5a747320292fef3d6d93b1fc6b4e4dfd5d2e5605 X-VCS-Branch: master Date: Mon, 29 May 2017 13:44:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dfa936be-c516-4a95-bbbf-3fa5cfeb9807 X-Archives-Hash: 247d5f3f36f0e71d39f0e6edad156ea5 commit: 5a747320292fef3d6d93b1fc6b4e4dfd5d2e5605 Author: Michael Haubenwallner gentoo org> AuthorDate: Mon May 29 13:40:18 2017 +0000 Commit: Michael Haubenwallner gentoo 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." +}