1 |
haubi 11/05/26 09:46:17 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mico-2.3.13-r5.ebuild |
5 |
Log: |
6 |
Fix building with gcc-4.6.0 (#365117). run eautoreconf. Improve support for -Wl,--as-needed (#280678); Keep patches-tarball in devspace. |
7 |
|
8 |
(Portage version: 2.1.9.42/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.31 net-misc/mico/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mico/ChangeLog?rev=1.31&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mico/ChangeLog?rev=1.31&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mico/ChangeLog?r1=1.30&r2=1.31 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v |
20 |
retrieving revision 1.30 |
21 |
retrieving revision 1.31 |
22 |
diff -u -r1.30 -r1.31 |
23 |
--- ChangeLog 1 Dec 2010 09:57:46 -0000 1.30 |
24 |
+++ ChangeLog 26 May 2011 09:46:17 -0000 1.31 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for net-misc/mico |
27 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.30 2010/12/01 09:57:46 haubi Exp $ |
29 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.31 2011/05/26 09:46:17 haubi Exp $ |
31 |
+ |
32 |
+*mico-2.3.13-r5 (26 May 2011) |
33 |
+ |
34 |
+ 26 May 2011; Michael Haubenwallner <haubi@g.o> |
35 |
+ +mico-2.3.13-r5.ebuild: |
36 |
+ Fix building with gcc-4.6.0 (#365117). run eautoreconf. Improve support |
37 |
+ for -Wl,--as-needed (#280678); Keep patches-tarball in devspace. |
38 |
|
39 |
*mico-2.3.13-r4 (29 Nov 2010) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 net-misc/mico/mico-2.3.13-r5.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mico/mico-2.3.13-r5.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mico/mico-2.3.13-r5.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: mico-2.3.13-r5.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2011 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r5.ebuild,v 1.1 2011/05/26 09:46:17 haubi Exp $ |
54 |
|
55 |
EAPI="3" |
56 |
|
57 |
inherit eutils flag-o-matic toolchain-funcs autotools |
58 |
|
59 |
DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" |
60 |
HOMEPAGE="http://www.mico.org/" |
61 |
SRC_URI="http://www.mico.org/${P}.tar.gz" |
62 |
|
63 |
PATCH_VER=0.2 |
64 |
|
65 |
LICENSE="GPL-2 LGPL-2" |
66 |
SLOT="0" |
67 |
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" |
68 |
IUSE="gtk postgres qt4 ssl tcl threads X" |
69 |
RESTRICT="test" #298101 |
70 |
|
71 |
[[ -z ${PATCH_VER} ]] || \ |
72 |
SRC_URI="${SRC_URI} http://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.bz2" |
73 |
|
74 |
# doesn't compile: |
75 |
# bluetooth? ( net-wireless/bluez ) |
76 |
|
77 |
RDEPEND=" |
78 |
gtk? ( x11-libs/gtk+:2 ) |
79 |
postgres? ( dev-db/postgresql-base ) |
80 |
qt4? ( x11-libs/qt-gui:4[qt3support] ) |
81 |
ssl? ( dev-libs/openssl ) |
82 |
tcl? ( dev-lang/tcl ) |
83 |
X? ( x11-libs/libXt ) |
84 |
" |
85 |
DEPEND="${RDEPEND} |
86 |
>=sys-devel/flex-2.5.2 |
87 |
>=sys-devel/bison-1.22 |
88 |
" |
89 |
|
90 |
S=${WORKDIR}/${PN} |
91 |
|
92 |
src_prepare() { |
93 |
EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches |
94 |
|
95 |
eautoreconf |
96 |
|
97 |
# cannot use big TOC (AIX only), gdb doesn't like it. |
98 |
# This assumes that the compiler (or -wrapper) uses |
99 |
# gcc flag '-mminimal-toc' for compilation. |
100 |
sed -i -e 's/,-bbigtoc//' "${S}"/configure |
101 |
|
102 |
if use qt4; then |
103 |
sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure || |
104 |
die "cannot update to use Qt3Support of qt4" |
105 |
fi |
106 |
} |
107 |
|
108 |
src_configure() { |
109 |
tc-export CC CXX |
110 |
|
111 |
if use gtk; then |
112 |
# need gtk-1 wrapper for gtk-2 |
113 |
export PATH="${WORKDIR}"/helpers:${PATH} |
114 |
fi |
115 |
|
116 |
# Don't know which version of JavaCUP would suffice, but there is no |
117 |
# configure argument to disable checking for JavaCUP. |
118 |
# So we override the configure check to not find 'javac'. |
119 |
export ac_cv_path_JAVAC=no |
120 |
|
121 |
# '--without-ssl' just does not add another search path - the only way |
122 |
# to disable openssl utilization seems to override the configure check. |
123 |
use ssl || export ac_cv_lib_ssl_open=no |
124 |
|
125 |
# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are. |
126 |
use qt4 && append-cppflags $(pkg-config --cflags Qt3Support) |
127 |
|
128 |
local myconf= |
129 |
myconf() { |
130 |
myconf="${myconf} $*" |
131 |
} |
132 |
|
133 |
myconf --disable-mini-stl |
134 |
myconf $(use_enable threads) |
135 |
|
136 |
# '--without-*' or '--with-*=no' does not disable some features, |
137 |
# the value needs to be empty instead. |
138 |
# This applies to: gtk, pgsql, qt, tcl, bluetooth. |
139 |
myconf --with-gtk=$( use gtk && echo "${EPREFIX}"/usr) |
140 |
myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr) |
141 |
myconf --with-qt=$( use qt4 && echo "${EPREFIX}"/usr) |
142 |
myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr) |
143 |
# bluetooth and wireless both don't compile cleanly |
144 |
myconf --with-bluetooth='' |
145 |
myconf --disable-wireless |
146 |
# But --without-x works. |
147 |
myconf $(use_with X x "${EPREFIX}"/usr) |
148 |
|
149 |
# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html |
150 |
[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED |
151 |
|
152 |
if [[ ${CHOST} == *-winnt* ]]; then |
153 |
# disabling static libs, since ar on interix takes nearly |
154 |
# one hour per library, thanks to mico's monster objects. |
155 |
use threads && |
156 |
ewarn "disabling USE='threads', does not work on ${CHOST}" |
157 |
myconf --disable-threads --disable-static --enable-final |
158 |
append-flags -D__STDC__ |
159 |
fi |
160 |
|
161 |
econf ${myconf} |
162 |
} |
163 |
|
164 |
src_install() { |
165 |
emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=: || die "install failed" |
166 |
|
167 |
dodir /usr/share || die |
168 |
mv "${ED}"usr/man "${ED}"usr/share || die |
169 |
dodir /usr/share/doc/${PF} || die |
170 |
mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die |
171 |
|
172 |
dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO || die |
173 |
} |