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