work with (forced) --as-needed linker flag (#280678)

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 137 insertions, 2 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index dbd41c512dc4..3f28100217c4 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mico
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.21 2009/07/07 08:00:06 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.22 2009/09/09 06:34:16 haubi Exp $
+
+*mico-2.3.13-r1 (09 Sep 2009)
+
+  09 Sep 2009; Michael Haubenwallner <haubi@gentoo.org>
+  +mico-2.3.13-r1.ebuild, +files/mico-2.3.13-as-needed.patch:
+  work with (forced) --as-needed linker flag (#280678)
 
   07 Jul 2009; Michael Haubenwallner <haubi@gentoo.org>
   +files/mico-2.3.13-hpux.patch, mico-2.3.13.ebuild:
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 16ff169e0849..36712cb97734 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,10 +1,12 @@
 AUX gtk-config 87 RMD160 372fe81433c28726f71cf99986c9142f20605433 SHA1 973a86ac03cd251315e7b0a7a72d23603f1823c5 SHA256 95dc7514f6a305656ca9b973321e02a0376e9397ad6ad323f65d7601cfd7f015
 AUX mico-2.3.13-aix.patch 411 RMD160 a6f750d3e15e39b5b3e89645484bb631b6ec5eaa SHA1 ca97fbaf38ea738273c2f051decda928484b5bf4 SHA256 0823e1d621ba0e313ba00b675ffc650c2ebc83138b0ec21d5ab6b9dd3e5b9c9f
+AUX mico-2.3.13-as-needed.patch 553 RMD160 71e2e0fabcab2c2f9e705c66560e374427d95028 SHA1 19f2a8114c52bc53e01bc5f0bb6c2c0a07d018ef SHA256 3d7358e819dcb8a9ecc3291a53f76b710602aef30a58e7f44a38ae92144aacfe
 AUX mico-2.3.13-gcc43.patch 752 RMD160 767d448586b2ab8e773f8145ca77f23ea0cf317a SHA1 d6c1ef757d3cedad9b1fc2b5846a9ee16dc41538 SHA256 be64300153630158eab537dda057204159b482372b17b54ccc2177a7d884a535
 AUX mico-2.3.13-hpux.patch 689 RMD160 f112e97d1c1c579f9d5010a941584fbf3e247af3 SHA1 18fc7c5012a6a2e358647c2b37e6c73709146794 SHA256 6506bb60fa0514b7a6c232328720d32f0fce44cc53c389793bb4a133c339084c
 AUX mico-2.3.13-nolibcheck.patch 1124 RMD160 557c3588420938cef2365c86ff22a67c6c7594f9 SHA1 ac73d6113a2c0f65c4f6912a8a58e944a3d97d94 SHA256 bbc92cbfa298ac292d80f76859594430c0581af564df9fad7f5870d92fd3d333
 AUX mico-2.3.13-pthread.patch 1317 RMD160 1ef269452add11a18e5c313c126029afb1a110ea SHA1 f226c9882472b574431c39d23a82217f2c253bc9 SHA256 485f1e35fb71643f2d3c1181cd96d75e7c2174fe4cae5d2537a51ad43aa7b8ff
 DIST mico-2.3.13.tar.gz 3269814 RMD160 70c8b9e68deac853ed2a28f48cd719bdef4e60fb SHA1 ee0138deb4d9ad0a50fe18e0b2add99fb5831c93 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69
+EBUILD mico-2.3.13-r1.ebuild 3299 RMD160 0cb2dfb04ead97c863bcc7ed378cc737e0345183 SHA1 f9533aa4d225facb6a77a34dd069caf6457e3891 SHA256 e7f35ca2613e546750b311612686add2ecca3cb8d2469a3f004eb3e47f07849c
 EBUILD mico-2.3.13.ebuild 3245 RMD160 dc65e4844d9e63567c41cfc6e20723ca3955128d SHA1 2413ebcfb0f3b4cc44fc88a4e4261be2c07cbd87 SHA256 52455bf40f7c5487bd6c9779c9c98815ce5b8a7e7e8e6b5c1c1f9fdcdcaf33e5
-MISC ChangeLog 1429 RMD160 ae37a4c0fce422f490fb7e60b15a4920e42ec969 SHA1 8eda3f877ae1b219b47ba8cf9cb81a17ba8b43f1 SHA256 df1ca69b2aa102ae654c5722a8d2f3116196ad8a82774870aeb74509b7a95225
+MISC ChangeLog 1634 RMD160 3a48855c7042c0b046549665cdbac59e3d4fd629 SHA1 1b93eaa89ae83bf32172b9563813720d343ecd3e SHA256 cc4a67c991370c29e557fd8a9d153527575b16cdb1115c8539d117e754398682
 MISC metadata.xml 640 RMD160 7c861b35cb15bad094830b9e83d0077fb7177a4b SHA1 5426b40b5f7a464c4a4577bef86ab0fcd1be117f SHA256 1f8be72dd1c133d7a282c5e5564466680dff87ed0c5daf688b6dca00327d9f85
diff --git a/net-misc/mico/files/mico-2.3.13-as-needed.patch b/net-misc/mico/files/mico-2.3.13-as-needed.patch
new file mode 100644
index 000000000000..2ef5ceea15b4
--- /dev/null
+++ b/net-misc/mico/files/mico-2.3.13-as-needed.patch
@@ -0,0 +1,22 @@
+Link libmico.so against ssl,crypto on any platform when necessary,
+to get -Wl,--as-needed working. #280678.
+--- orb/Makefile.orig	2009-09-08 18:25:23.157431541 +0200
++++ orb/Makefile	2009-09-08 18:27:23.717729431 +0200
+@@ -31,7 +31,7 @@
+ endif
+ 
+ PLATFORM_LIBS =
+-ifeq ($(HAVE_CYGWIN), yes)
++#ifeq ($(HAVE_CYGWIN), yes)
+ ifeq ($(USE_CSL2), yes)
+ PLATFORM_LIBS := $(PLATFORM_LIBS) -lssl -lcrypto
+ else
+@@ -43,7 +43,7 @@
+ endif
+ endif
+ endif
+-endif
++#endif
+ 
+ ifeq ($(HAVE_ORB_EXCEPTS), no)
+ CXXFLAGS := $(CXXFLAGS) $(NOEHFLAGS) -DMICO_CONF_NO_EXCEPTIONS
diff --git a/net-misc/mico/mico-2.3.13-r1.ebuild b/net-misc/mico/mico-2.3.13-r1.ebuild
new file mode 100644
index 000000000000..f02a3a9981a6
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r1.ebuild,v 1.1 2009/09/09 06:34:16 haubi Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
+HOMEPAGE="http://www.mico.org/"
+SRC_URI="http://www.mico.org/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="gtk postgres qt3 ssl tcl threads X"
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez-libs )
+
+RDEPEND="
+	gtk?       ( >=x11-libs/gtk+-2 )
+	postgres?  ( dev-db/postgresql )
+	qt3?       ( =x11-libs/qt-3* )
+	ssl?       ( dev-libs/openssl )
+	tcl?       ( dev-lang/tcl )
+	X?         ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.2
+	>=sys-devel/bison-1.22
+"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die "failed to cd to '${S}'"
+
+	epatch "${FILESDIR}"/${P}-nolibcheck.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-pthread.patch
+	epatch "${FILESDIR}"/${P}-aix.patch
+	epatch "${FILESDIR}"/${P}-hpux.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch #280678
+
+	# cannot use big TOC (AIX only), gdb doesn't like it.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure
+}
+
+src_compile() {
+	tc-export CC CXX
+
+	if use gtk; then
+		# set up gtk-1 wrapper for gtk-2
+		mkdir "${T}"/path || die "failed to create temporary path"
+		cp "${FILESDIR}"/gtk-config "${T}"/path || die "failed to dupe gtk-config"
+		chmod +x "${T}"/path/gtk-config || die "failed to arm gtk-config"
+		export PATH="${T}"/path:${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'.
+	export ac_cv_path_JAVAC=no
+
+	# '--without-ssl' just does not add another search path - the only way
+	# to disable openssl utilization seems to override the configure check.
+	use ssl || export ac_cv_lib_ssl_open=no
+
+	# '--without-*' or '--with-*=no' does not disable some features, the value
+	# needs to be empty instead. This applies to: bluetooth, gtk, pgsql, qt, tcl.
+	# But --without-x works.
+
+	# moc is searched within PATH, not within QTDIR.
+	use qt3 && export MOC="${QTDIR}"/bin/moc
+
+	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
+	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
+
+	# bluetooth and wireless both don't compile cleanly
+	econf \
+		--disable-mini-stl \
+		$(use_enable threads) \
+		--with-gtk=$(use gtk && echo /usr) \
+		--with-pgsql=$(use postgres && echo /usr) \
+		--with-qt=$(use qt3 && echo "${QTDIR}") \
+		--with-tcl=$(use tcl && echo /usr) \
+		$(use_with X x /usr) \
+		--with-bluetooth='' \
+		--disable-wireless
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake INSTDIR="${D}"/usr SHARED_INSTDIR="${D}"/usr install LDCONFIG=: || die "install failed"
+
+	dodir /usr/share || die
+	mv "${D}"/usr/man "${D}"/usr/share || die
+	dodir /usr/share/doc/${PF} || die
+	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF} || die
+
+	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO || die
+}