| 1 |
commit: d63834bbdc7a999a0447f659d5aa9a9097556c8c |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 2 11:23:02 2017 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 2 11:23:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63834bb |
| 7 |
|
| 8 |
net-misc/mico: avoid file collision with net-misc/eventd, bug#632170 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/632170 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.1 |
| 13 |
|
| 14 |
.../{mico-9999.ebuild => mico-2.3.13-r10.ebuild} | 22 ++++++++++++++++------ |
| 15 |
net-misc/mico/mico-9999.ebuild | 7 +++++++ |
| 16 |
2 files changed, 23 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-2.3.13-r10.ebuild |
| 19 |
similarity index 84% |
| 20 |
copy from net-misc/mico/mico-9999.ebuild |
| 21 |
copy to net-misc/mico/mico-2.3.13-r10.ebuild |
| 22 |
index 7cf32aaacff..024721e397f 100644 |
| 23 |
--- a/net-misc/mico/mico-9999.ebuild |
| 24 |
+++ b/net-misc/mico/mico-2.3.13-r10.ebuild |
| 25 |
@@ -26,7 +26,7 @@ DESCRIPTION="A freely available and fully compliant implementation of the CORBA |
| 26 |
HOMEPAGE="http://www.mico.org/" |
| 27 |
LICENSE="GPL-2 LGPL-2" |
| 28 |
SLOT="0" |
| 29 |
-KEYWORDS="" |
| 30 |
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" |
| 31 |
IUSE="gtk postgres qt4 ssl tcl threads X" |
| 32 |
RESTRICT="test" #298101 |
| 33 |
|
| 34 |
@@ -58,7 +58,6 @@ fi |
| 35 |
src_prepare() { |
| 36 |
default |
| 37 |
|
| 38 |
- mv configure.in configure.ac || die #426262 |
| 39 |
eautoreconf |
| 40 |
|
| 41 |
# cannot use big TOC (AIX only), gdb doesn't like it. |
| 42 |
@@ -75,6 +74,11 @@ src_prepare() { |
| 43 |
src_configure() { |
| 44 |
tc-export CC CXX |
| 45 |
|
| 46 |
+ if use gtk && [[ -n ${PATCH_VER} ]]; then |
| 47 |
+ # need gtk-1 wrapper for gtk-2 |
| 48 |
+ export PATH="${WORKDIR}"/helpers:${PATH} |
| 49 |
+ fi |
| 50 |
+ |
| 51 |
# Don't know which version of JavaCUP would suffice, but there is no |
| 52 |
# configure argument to disable checking for JavaCUP. |
| 53 |
# So we override the configure check to not find 'javac'. |
| 54 |
@@ -97,7 +101,8 @@ src_configure() { |
| 55 |
|
| 56 |
# '--without-*' or '--with-*=no' does not disable some features, |
| 57 |
# the value needs to be empty instead. |
| 58 |
- # This applies to: pgsql, qt, tcl, bluetooth. |
| 59 |
+ # This applies to: gtk, pgsql, qt, tcl, bluetooth. |
| 60 |
+ myconf --with-gtk=$( use gtk && echo "${EPREFIX}"/usr) |
| 61 |
myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr) |
| 62 |
myconf --with-qt=$( use qt4 && echo "${EPREFIX}"/usr) |
| 63 |
myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr) |
| 64 |
@@ -106,8 +111,6 @@ src_configure() { |
| 65 |
myconf --disable-wireless |
| 66 |
# But --without-x works. |
| 67 |
myconf $(use_with X x "${EPREFIX}"/usr) |
| 68 |
- # Same for gtk after patch 013, searches for gtk release. |
| 69 |
- myconf $(use_with gtk gtk 2) |
| 70 |
|
| 71 |
# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html |
| 72 |
[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED |
| 73 |
@@ -134,16 +137,23 @@ src_install() { |
| 74 |
mv "${ED}"usr/bin/{,mico-}nsd || die |
| 75 |
mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die |
| 76 |
|
| 77 |
+ # avoid conflict with net-misc/eventd, bug#632170 |
| 78 |
+ mv "${ED}"usr/bin/{,mico-}eventd || die |
| 79 |
+ |
| 80 |
dodir /usr/share |
| 81 |
mv "${ED}"usr/man "${ED}"usr/share || die |
| 82 |
dodir /usr/share/doc/${PF} |
| 83 |
mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die |
| 84 |
|
| 85 |
- dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO |
| 86 |
+ dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO |
| 87 |
} |
| 88 |
|
| 89 |
pkg_postinst() { |
| 90 |
einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'" |
| 91 |
einfo "due to a name conflict with net-dns/nsd. For details" |
| 92 |
einfo "please refer to https://bugs.gentoo.org/544488." |
| 93 |
+ einfo |
| 94 |
+ einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'" |
| 95 |
+ einfo "due to a name conflict with net-misc/eventd. For details" |
| 96 |
+ einfo "please refer to https://bugs.gentoo.org/632170." |
| 97 |
} |
| 98 |
|
| 99 |
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild |
| 100 |
index 7cf32aaacff..7012727c9d6 100644 |
| 101 |
--- a/net-misc/mico/mico-9999.ebuild |
| 102 |
+++ b/net-misc/mico/mico-9999.ebuild |
| 103 |
@@ -134,6 +134,9 @@ src_install() { |
| 104 |
mv "${ED}"usr/bin/{,mico-}nsd || die |
| 105 |
mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die |
| 106 |
|
| 107 |
+ # avoid conflict with net-misc/eventd, bug#632170 |
| 108 |
+ mv "${ED}"usr/bin/{,mico-}eventd || die |
| 109 |
+ |
| 110 |
dodir /usr/share |
| 111 |
mv "${ED}"usr/man "${ED}"usr/share || die |
| 112 |
dodir /usr/share/doc/${PF} |
| 113 |
@@ -146,4 +149,8 @@ pkg_postinst() { |
| 114 |
einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'" |
| 115 |
einfo "due to a name conflict with net-dns/nsd. For details" |
| 116 |
einfo "please refer to https://bugs.gentoo.org/544488." |
| 117 |
+ einfo |
| 118 |
+ einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'" |
| 119 |
+ einfo "due to a name conflict with net-misc/eventd. For details" |
| 120 |
+ einfo "please refer to https://bugs.gentoo.org/632170." |
| 121 |
} |
Archives