From fe3759f5f680150b9218dad3dff8a33ca8c1e66b Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Wed, 11 Mar 2009 14:15:53 +0000 Subject: Fix automagic dependency on mdns-responder, spotted by flameeyes Package-Manager: portage-2.2_rc24/cvs/Linux x86_64 --- gnustep-base/gnustep-base/ChangeLog | 9 ++- gnustep-base/gnustep-base/Manifest | 4 +- .../files/gnustep-base-1.18.0-mdns_configure.patch | 26 +++++++ .../gnustep-base/gnustep-base-1.18.0-r3.ebuild | 89 ++++++++++++++++++++++ 4 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 gnustep-base/gnustep-base/files/gnustep-base-1.18.0-mdns_configure.patch create mode 100644 gnustep-base/gnustep-base/gnustep-base-1.18.0-r3.ebuild (limited to 'gnustep-base') diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog index f2371568fd33..0f100de7897b 100644 --- a/gnustep-base/gnustep-base/ChangeLog +++ b/gnustep-base/gnustep-base/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnustep-base/gnustep-base # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.82 2009/02/23 10:25:47 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.83 2009/03/11 14:15:53 voyageur Exp $ + +*gnustep-base-1.18.0-r3 (11 Mar 2009) + + 11 Mar 2009; Bernard Cafarelli + +files/gnustep-base-1.18.0-mdns_configure.patch, + +gnustep-base-1.18.0-r3.ebuild: + Fix automagic dependency on mdns-responder, spotted by flameeyes *gnustep-base-1.18.0-r2 (23 Feb 2009) diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest index b16f4c55dff7..f507278f995e 100644 --- a/gnustep-base/gnustep-base/Manifest +++ b/gnustep-base/gnustep-base/Manifest @@ -1,4 +1,5 @@ AUX 50-gnustep-revdep 35 RMD160 f9508891da2de58ef884baabf9206577653a409b SHA1 40e21ae24078afb92067f51ca82722f20b742512 SHA256 e0bde19a964f2ae01855b4353c3d2af7b0b0ca25231827798ebfea16e435d3a2 +AUX gnustep-base-1.18.0-mdns_configure.patch 899 RMD160 1accfd45753666d95ffbac304f91d9f7f93fed10 SHA1 c847efcbfd2b3ce43ba79bec94c8ba4c0fcc54bf SHA256 a6613e90f24bbc18d43a9fe4ee669afedc613853eaac33547a95cc6a6e2848e2 DIST gnustep-base-1.16.3.tar.gz 2532346 RMD160 11d387437b13b0fe439df6b354ebece767ccee2a SHA1 a06ffac4972416b814682821f959bcf29bead47a SHA256 81e1f150c4d2547877066fda4ce9d0b07c18a489b94e6b171cbb16ccdcb4137b DIST gnustep-base-1.16.5.tar.gz 2539752 RMD160 595d69a67ddb79a5aaf111d25d00294c16e8b53c SHA1 1d98fd25a98ddc70c3b41151c6013ab3a106ceca SHA256 7417c68e25d923626fd2f2b345fc7501dba0f62f16f154a91c0d7798ebcfde56 DIST gnustep-base-1.18.0.tar.gz 2565694 RMD160 8cad9ac1ea0775ca4d2af0db76f1f457eda5784d SHA1 30c13e673ad550c988f03adb9c545a8de1a17d19 SHA256 3c94ce1711b188b34fb750176d5d2e81d0010e323625bc4b79d550846a299ddd @@ -7,5 +8,6 @@ EBUILD gnustep-base-1.16.3.ebuild 2638 RMD160 a27e0b2397f9c879ee66cddf4f4f26d457 EBUILD gnustep-base-1.16.5.ebuild 2180 RMD160 46ccb49b3302c46ebe683b82e4cdaf8dbc1e2b95 SHA1 f6ae413cbf0582813be4dfc2644ff9e40e89e2de SHA256 65eda7fcc1e06711e536774e3302d8a52686d17c5a4bdcc67924d58083cced29 EBUILD gnustep-base-1.18.0-r1.ebuild 2231 RMD160 dbf0ff2ae2073a1cb13babadb2afd3e825b96d99 SHA1 297f079d4e6966401f558eb614977b2ad225365a SHA256 8d36772794f54bac47c7ed8000d9d108c2bdcb3677bb91c379e6ee8f40ef936f EBUILD gnustep-base-1.18.0-r2.ebuild 2284 RMD160 47f697bb9cbce4f785e617581d3e8944cdfae643 SHA1 0fd8c94f269e16f244425ea5eae2c5f20eeecd80 SHA256 808e002292f5ee8e6f0ba3816a7060ae84a0d5275810dc64b8faee90529cb280 -MISC ChangeLog 18212 RMD160 0fe3f34573cd553dffab3039b451b41d1013b59c SHA1 56def774470bdb82121411ab065382e759f8822a SHA256 79d5f8a4423b9070d1ca82bd7d1495d6d30119cbd130371fc1405425e6171e45 +EBUILD gnustep-base-1.18.0-r3.ebuild 2552 RMD160 ae2de34d5fb26974c4aa466762f96bcc138c17e7 SHA1 79c7afe0064a1bc6f3a450db7f87ea1dc6fb9c61 SHA256 28e942b4a3a3fed9f62032f18db59b0e949ba33d03addb18c456b4d231f4a61d +MISC ChangeLog 18459 RMD160 008ecfcd1b077d41edc5e79dd6ee443590d96659 SHA1 934facb6ef23e077c039e4d6947f0d6b6314e350 SHA256 0786bef3bc127961afa3a11dc245c0a90837365270381ab8e4e48d6f3474e244 MISC metadata.xml 875 RMD160 7a28660f89920d727869012e040494f292901337 SHA1 024ba545246147e0faf54166b23cbe154121ae3a SHA256 df8f3539ebc1ccd382871fc3d02a346dc152bedc112b4c4ce3380769ea99bff1 diff --git a/gnustep-base/gnustep-base/files/gnustep-base-1.18.0-mdns_configure.patch b/gnustep-base/gnustep-base/files/gnustep-base-1.18.0-mdns_configure.patch new file mode 100644 index 000000000000..9f187e0913ba --- /dev/null +++ b/gnustep-base/gnustep-base/files/gnustep-base-1.18.0-mdns_configure.patch @@ -0,0 +1,26 @@ +--- configure.ac.orig 2008-12-22 16:16:38.000000000 +0100 ++++ configure.ac 2009-03-11 13:50:03.000000000 +0100 +@@ -2376,12 +2376,18 @@ + # Check for NSNetServices + #-------------------------------------------------------------------- + HAVE_MDNS=0 +-AC_CHECK_HEADERS(dns_sd.h, have_mdns=yes, have_mdns=no) +-if test "$have_mdns" = "yes"; then +- AC_CHECK_LIB(dns_sd, DNSServiceBrowse, have_mdns=yes, have_mdns=no) ++AC_ARG_ENABLE(zeroconf, ++ [ --disable-zeroconf Disable NSNetServices support],, ++ enable_zeroconf=yes) ++ ++if test $enable_zeroconf = yes; then ++ AC_CHECK_HEADERS(dns_sd.h, have_mdns=yes, have_mdns=no) + if test "$have_mdns" = "yes"; then +- LIBS="-ldns_sd $LIBS" +- HAVE_MDNS=1 ++ AC_CHECK_LIB(dns_sd, DNSServiceBrowse, have_mdns=yes, have_mdns=no) ++ if test "$have_mdns" = "yes"; then ++ LIBS="-ldns_sd $LIBS" ++ HAVE_MDNS=1 ++ fi + fi + fi + AC_SUBST(HAVE_MDNS) diff --git a/gnustep-base/gnustep-base/gnustep-base-1.18.0-r3.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.18.0-r3.ebuild new file mode 100644 index 000000000000..2f5cb18a301d --- /dev/null +++ b/gnustep-base/gnustep-base/gnustep-base-1.18.0-r3.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.18.0-r3.ebuild,v 1.1 2009/03/11 14:15:53 voyageur Exp $ + +EAPI=2 + +inherit autotools gnustep-base + +DESCRIPTION="A library of general-purpose, non-graphical Objective C objects." + +HOMEPAGE="http://www.gnustep.org" +SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +SLOT="0" +LICENSE="GPL-2 LGPL-2.1" + +IUSE="gcc-libffi gnutls zeroconf" + +DEPEND="${GNUSTEP_CORE_DEPEND} + >=gnustep-base/gnustep-make-2.0 + !gcc-libffi? ( dev-libs/ffcall + gnustep-base/gnustep-make[-native-exceptions] ) + gcc-libffi? ( >=sys-devel/gcc-3.3.5[libffi] ) + gnutls? ( net-libs/gnutls ) + >=dev-libs/libxml2-2.6 + >=dev-libs/libxslt-1.1 + >=dev-libs/gmp-4.1 + >=dev-libs/openssl-0.9.7 + >=sys-libs/zlib-1.2 + zeroconf? ( || ( + net-dns/avahi[mdnsresponder-compat] + net-misc/mDNSResponder ) )" +RDEPEND="${DEPEND}" + +src_prepare() { + # Automagic dependency on mdns-responder + epatch "${FILESDIR}"/${P}-mdns_configure.patch + + eautoreconf +} + +src_configure() { + egnustep_env + + local myconf + if use gcc-libffi; + then + myconf="--enable-libffi --disable-ffcall" + else + myconf="--disable-libffi --enable-ffcall" + fi + + myconf="$myconf $(use_enable gnutls tls)" + myconf="$myconf $(use_enable zeroconf)" + myconf="$myconf --with-xml-prefix=/usr" + myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib" + myconf="$myconf --with-default-config=/etc/GNUstep/GNUstep.conf" + + econf $myconf || die "configure failed" +} + +src_install() { + # We need to set LD_LIBRARY_PATH because the doc generation program + # uses the gnustep-base libraries. Since egnustep_env "cleans the + # environment" including our LD_LIBRARY_PATH, we're left no choice + # but doing it like this. + + egnustep_env + egnustep_install + + if use doc ; then + export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}" + egnustep_doc + fi + egnustep_install_config + + dodir /etc/revdep-rebuild + sed -e 's|$GNUSTEP_SEARCH_DIRS|'"$GNUSTEP_SYSTEM_LIBRARIES $GNUSTEP_SYSTEM_TOOLS $GNUSTEP_LOCAL_LIBRARIES $GNUSTEP_LOCAL_TOOLS"'|' \ + "${FILESDIR}"/50-gnustep-revdep \ + > "${D}/etc/revdep-rebuild/50-gnustep-revdep" +} + +pkg_postinst() { + ewarn "The shared library version has changed in this release." + ewarn "You will need to recompile all Applications/Tools/etc in order" + ewarn "to use this library." + ewarn "Run:" + ewarn "revdep-rebuild --library \"libgnustep-base.so.1.1[0-6]\"" +} -- cgit v1.2.3-65-gdbad