Fix building with -Wl,--as-needed wrt #276506 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 88 insertions, 23 deletions

diff --git a/app-admin/lsyncd/ChangeLog b/app-admin/lsyncd/ChangeLog
index 5b39dcea2083..fedb91c365ef 100644
--- a/app-admin/lsyncd/ChangeLog
+++ b/app-admin/lsyncd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/lsyncd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/ChangeLog,v 1.3 2010/06/10 22:00:58 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/ChangeLog,v 1.4 2010/06/29 15:49:10 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> lsyncd-1.33.ebuild,
+  +files/lsyncd-1.33-libxml2.patch:
+  Fix building with -Wl,--as-needed wrt #276506 by Kacper Kowalik.
 
 *lsyncd-1.33 (10 Jun 2010)
 
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index ce55da59a257..f7e66f622503 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX lsyncd-1.33-libxml2.patch 1615 RMD160 5d2a59e7653198b751fc6d748033c50a30622b00 SHA1 afad61ab8ba6f2ed013247a4200c8d47a258d007 SHA256 bd546062a3d94f2404148033e6a8a78121e21ce8ef0c01fe73896bce05ce4dbc
 DIST lsyncd-1.26.tar.gz 171811 RMD160 79f2f3c88f956dafc41e9936fad9a0a02ce311f9 SHA1 73f738b987905ffcfe34f763921fe837e1b34102 SHA256 717eb5b17d2244993e8be5c63595457e7c7825ede20b21e072f1564552d850eb
 DIST lsyncd-1.33.tar.gz 168979 RMD160 54a7f4226fce5e5e6a38f80ae36d51907db96038 SHA1 adc7498afddf3f45d6ff187f977ea28003cb5e22 SHA256 8dfeb81a89931c57c7161f4f584d136aa620181c243545f31a471a947b016dfe
 EBUILD lsyncd-1.26.ebuild 576 RMD160 f3e1387fb5999fdfff8d478fc54bc5f18fcd20f0 SHA1 5aa0402be8dcdaad154b30ffe9801c5a303332e8 SHA256 73f80381306c83613d0a5e5d4a03519f8229949bdae8de6a02ae186377f8833a
-EBUILD lsyncd-1.33.ebuild 583 RMD160 454e1cc1175619d13dcaca824bacb5f6430bc35f SHA1 073c53253f1d0deef6159c24c5acf29c6a3ee0c9 SHA256 07d94cf9445c3e05eb3e797e74debcbb6e8c5ea347ed313f3f1c023b3d114068
-MISC ChangeLog 459 RMD160 3526f50c10291819d54d6de6e367fe45a7dd038e SHA1 1a2c4dc547e32942278884f41f76e28e24954b2a SHA256 d1d4be6d7a1660cbae3197c6947822bf98802ba49e26bcc8e08b938297cdae11
+EBUILD lsyncd-1.33.ebuild 758 RMD160 9986363bc26b540ec8d40291575fe933281b2404 SHA1 03ccb36a358875b3c87a07b4ee4b36ab4d97f507 SHA256 6f4e7618c792a028ca66a0c6ccfa46f68ee2520af0717eb9636ccf672079b7f8
+MISC ChangeLog 641 RMD160 c3f781cbe1fd5bf3fd6ce01f5b27e510c5dc38b1 SHA1 e3500ab5bf10be73ea410e1542f5a6f36cf4dc7d SHA256 5aeae8ff7731c37ce306b07149c87e4d0355f03d25f1d729ef39a0af48827151
 MISC metadata.xml 282 RMD160 48c9b59192dcee0f15c93436e8e71b5f4a12e5fe SHA1 c0190a3219b37a7b45ccf4747b217290f92c4254 SHA256 ed1e1baf6b60d0283220c353681b4c246aac5c65dadb4c0e0e61a4cc206838db
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQEcBAEBCgAGBQJMEWCkAAoJEAWF714uGAc63jsH/0BRM/VPu0Avo0YRjQBfX4Ch
-hmOzXWMlkunSiPNzAaYEkI+T5hBj7VXqJR6kZ+DHjbByzugm3gnb/SH9OyuVS5KK
-Bz/xI9Mvzazo8maIa53jf8ACJuAWD8MJl03M79dsgkXs2Im47Ly7ppoh7/PmHACv
-PxAVAeqx7S6zmRNV32d/RfgX6gif1KXRY4/Edy3Nke5Lu4622LAdAHgHHSdg1f0u
-ZsC3QfrJYIw3qPgwfbwrGHSbax2YxNYyVZ9xyj6gOM7LD1E+kJq+z0NH13w5lODY
-arHYi1eqpx8M/S5Me5gIenCMF+Ded8akSioENHx6OvTpHxnmSrQL8uJ7pEbsZ/A=
-=0Yad
------END PGP SIGNATURE-----
diff --git a/app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch b/app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch
new file mode 100644
index 000000000000..b233cbfa2869
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch
@@ -0,0 +1,62 @@
+--- configure.in
++++ configure.in
+@@ -3,25 +3,24 @@
+ m4_define(LSYNCD_VERSION,1.26)
+ AM_INIT_AUTOMAKE(LSYNCD_PACKAGE,LSYNCD_VERSION)
+ 
+-AC_ARG_ENABLE([xml_config],
+-[  --enable-xml-config    Lsyncd is able to parse lsyncd.conf files (default: enabled)],
+-[case "${enableval}" in
+-  yes) xml_config=true ;;
+-  no)  xml_config=false ;;
+-  *) AC_MSG_ERROR([bad value ${enableval} for --enable-xml-config]) ;;
+-esac],[xml_config=true])
+-AM_CONDITIONAL(XML_CONFIG,[test x$xml_config = xtrue])
+-
+-#if test x$xml_config = xtrue; then
+-#AM_PATH_XML2(2.5.0,,AC_MSG_ERROR([*** Libxml is required if you do not --disable-xml-config]))
+-#fi
+-
+ AM_MAINTAINER_MODE
+ 
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_CHECK_HEADERS([sys/inotify.h])
+ 
++AC_MSG_CHECKING([checking whether to use libxml2])
++AC_ARG_ENABLE([xml],
++    [  --enable-xml      Lsyncd is able to parse lsyncd.conf files],
++    [enable_xml=$enableval],
++    [enable_xml="no"])
++AC_MSG_RESULT($enable_xml)
++if test "$enable_xml" = "yes"; then
++  AC_DEFINE(XML_CONFIG)
++  AM_PATH_XML2(2.4.0)
++fi
++
+ AC_CONFIG_HEADERS([config.h])
+ 
+ AC_OUTPUT(Makefile)
+--- Makefile.am
++++ Makefile.am
+@@ -1,6 +1,8 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ bin_PROGRAMS = lsyncd
+ lsyncd_SOURCES = lsyncd.c 
++lsyncd_CPPFLAGS = $(XML_CPPFLAGS)
++lsyncd_LDADD = $(XML_LIBS)
+ TESTS = tests/help.sh \
+ 	tests/directorymv.sh \
+ 	tests/directorycpr.sh \
+@@ -33,10 +35,3 @@
+ 	$(XP) -o $@ $(DB2MAN) $< 
+ 
+ AM_CFLAGS=-Wall 
+-AM_LDFLAGS=
+-if XML_CONFIG
+-DEFS+=-DXML_CONFIG
+-AM_CFLAGS += `xml2-config --cflags`
+-AM_LDFLAGS += `xml2-config --libs`
+-endif
+-
diff --git a/app-admin/lsyncd/lsyncd-1.33.ebuild b/app-admin/lsyncd/lsyncd-1.33.ebuild
index 6651c6eff393..7a21616f8497 100644
--- a/app-admin/lsyncd/lsyncd-1.33.ebuild
+++ b/app-admin/lsyncd/lsyncd-1.33.ebuild
@@ -1,22 +1,34 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-1.33.ebuild,v 1.1 2010/06/10 22:00:58 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-1.33.ebuild,v 1.2 2010/06/29 15:49:10 ssuominen Exp $
 
 EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Live Syncing (Mirror) Daemon"
 HOMEPAGE="http://code.google.com/p/lsyncd/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+SRC_URI="http://lsyncd.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="xml"
 
-DEPEND=""
-RDEPEND="net-misc/rsync"
+DEPEND="xml? ( dev-libs/libxml2 )"
+RDEPEND="${DEPEND}
+	net-misc/rsync"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libxml2.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable xml)
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS NEWS README TODO ChangeLog || die
 }