From 9b6855580ad2be8190fee65487af0599c41ad40f Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 7 Aug 2011 11:40:11 +0000 Subject: [PATCH] =?utf8?q?Fix=20underlinking=20wrt=20#368917=20by=20Diego?= =?utf8?q?=20Elio=20Petten=C3=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- dev-libs/librapi2/ChangeLog | 6 +++++- dev-libs/librapi2/Manifest | 11 ++++++----- .../files/librapi2-0.15.2-underlinking.patch | 13 +++++++++++++ dev-libs/librapi2/librapi2-0.15.2.ebuild | 9 +++++++-- 4 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 dev-libs/librapi2/files/librapi2-0.15.2-underlinking.patch diff --git a/dev-libs/librapi2/ChangeLog b/dev-libs/librapi2/ChangeLog index 9fbf543d84cc..74b12a430d88 100644 --- a/dev-libs/librapi2/ChangeLog +++ b/dev-libs/librapi2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/librapi2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/librapi2/ChangeLog,v 1.2 2011/05/21 05:33:25 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/librapi2/ChangeLog,v 1.3 2011/08/07 11:40:11 ssuominen Exp $ + + 07 Aug 2011; Samuli Suominen librapi2-0.15.2.ebuild, + +files/librapi2-0.15.2-underlinking.patch: + Fix underlinking wrt #368917 by Diego Elio Pettenò 21 May 2011; Samuli Suominen librapi2-0.15.2.ebuild: Always enable dbus support wrt #363257 by Diego Elio Pettenò. diff --git a/dev-libs/librapi2/Manifest b/dev-libs/librapi2/Manifest index 6cd7a2971ae0..3f7f08af14ec 100644 --- a/dev-libs/librapi2/Manifest +++ b/dev-libs/librapi2/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX librapi2-0.15.2-underlinking.patch 303 RMD160 6d3aeec891bae3adb851246f427260dd6b7acb37 SHA1 cce60acab0608d47c56e496fd3ba7b509c2f4f49 SHA256 bbebeff7052cc84ae1d928607044f8b10a58bd214b6390809ef41f6762dcaa36 DIST librapi2-0.15.2.tar.gz 508987 RMD160 1d9a82f1df226b82d1a7b46f01b7a7e972188798 SHA1 9092689a077df7250da56d24f97cd0ef1cbfb596 SHA256 d3c84d8cbc78a35585198595a73eefd3d051d0105cd9a58dd1f4735fee060a76 -EBUILD librapi2-0.15.2.ebuild 1064 RMD160 850f7fded941920466bcd0b366dca65d7149d479 SHA1 9a85c793cb72880ddb39204e1b462e027a302eda SHA256 c41f00b20a7f35142b3a570c77d44fbac0f7327bcaa95f5a06bccad83f6919ae -MISC ChangeLog 484 RMD160 fe8aa1e640e8a5f130d62215a247bec9c86a71c3 SHA1 493c901ff6e491b3c40efd461e15116e5aa76dae SHA256 a032eccd3136b9b3528324b5cad7d3acd212eff173fc61c8aae692a211014ae7 +EBUILD librapi2-0.15.2.ebuild 1173 RMD160 cff0b97100300df88c165010676ae47898088210 SHA1 c0ced92a610d935fef40d53d47ff416fbf370671 SHA256 6319871682a54fba9d226ff9fb7721f8c0f8ffaa206334e8c2e64d9abafde423 +MISC ChangeLog 662 RMD160 d08f17fa70b782a1ac37d4c36254075278a42bbe SHA1 a344da2869c341be8d3bd28822af0793e6e80210 SHA256 3a6fee9f3ffba3be95ca4a01e0247b84cc3dc6ca24c0b5b0097b947f89ac6749 MISC metadata.xml 262 RMD160 01f1a0c32aa27d9259eadcc1c59fbecc4bd5e09f SHA1 4f0ca8229e6e5da25194827d29a2da62bbbf3849 SHA256 a29056d87a6e83abaa5590fd7451d25359f4d8e3fe572b120bf0b2ccf8e3cd4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk3XTlAACgkQXkR9YqOcLPH/4AEAkLttXPiMX+FfZWS8sDyXe+WF -JUqGl/8o890o/+VxdaEA/Rx7U9nuwTor1bx73yU+5m1uBeyAYi6b1LY1vOWukx13 -=GBUg +iF4EAREIAAYFAk4+eNUACgkQXkR9YqOcLPFefwD/URWtmq+gN41nNAXXHaGCQPJh +qS379E3egRNMfoPWSrsA/0sFHiqsou/IaTxj8MKxd3OeiAnxfU2CD1LYe8QYui8C +=JguE -----END PGP SIGNATURE----- diff --git a/dev-libs/librapi2/files/librapi2-0.15.2-underlinking.patch b/dev-libs/librapi2/files/librapi2-0.15.2-underlinking.patch new file mode 100644 index 000000000000..0a4f356b402a --- /dev/null +++ b/dev-libs/librapi2/files/librapi2-0.15.2-underlinking.patch @@ -0,0 +1,13 @@ +Fix underlinking, http://bugs.gentoo.org/368917 + +--- tools/Makefile.am ++++ tools/Makefile.am +@@ -1,7 +1,7 @@ + AM_CFLAGS = @LIBSYNCE_CFLAGS@ + + INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/support +-LDADD = ../src/librapi.la ++LDADD = ../src/librapi.la @LIBSYNCE_LIBS@ + + noinst_PROGRAMS = oidinfo + diff --git a/dev-libs/librapi2/librapi2-0.15.2.ebuild b/dev-libs/librapi2/librapi2-0.15.2.ebuild index 4527b1c263d4..41ab72a8af36 100644 --- a/dev-libs/librapi2/librapi2-0.15.2.ebuild +++ b/dev-libs/librapi2/librapi2-0.15.2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/librapi2/librapi2-0.15.2.ebuild,v 1.3 2011/05/21 05:33:25 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/librapi2/librapi2-0.15.2.ebuild,v 1.4 2011/08/07 11:40:11 ssuominen Exp $ EAPI=3 PYTHON_DEPEND="python? 2:2.6" -inherit python +inherit autotools eutils python DESCRIPTION="A library for SynCE" HOMEPAGE="http://www.synce.org/" @@ -30,6 +30,11 @@ pkg_setup() { fi } +src_prepare() { + epatch "${FILESDIR}"/${P}-underlinking.patch + AT_M4DIR="m4" eautoreconf +} + src_configure() { econf \ --disable-dependency-tracking \ -- 2.26.2