From 913ce6b281e20a1904ca4737de18975293579fc1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Tue, 17 Apr 2007 10:16:09 +0000 Subject: [PATCH] Fix emerging with -Wl,--as-needed. Fixes bug #148412. Package-Manager: portage-2.1.2.3 --- app-text/sablotron/ChangeLog | 6 +++- app-text/sablotron/Manifest | 30 ++++++++++++++----- .../files/1.0.3-libsablot-expat.patch | 10 +++++++ app-text/sablotron/sablotron-1.0.3.ebuild | 11 +++---- 4 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 app-text/sablotron/files/1.0.3-libsablot-expat.patch diff --git a/app-text/sablotron/ChangeLog b/app-text/sablotron/ChangeLog index 3a3c22d1add4..3bb790afc48b 100644 --- a/app-text/sablotron/ChangeLog +++ b/app-text/sablotron/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/sablotron # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/ChangeLog,v 1.54 2007/03/14 02:16:28 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/ChangeLog,v 1.55 2007/04/17 10:16:09 betelgeuse Exp $ + + 17 Apr 2007; Petteri Räty + +files/1.0.3-libsablot-expat.patch, sablotron-1.0.3.ebuild: + Fix emerging with -Wl,--as-needed. Fixes bug #148412. *sablotron-1.0.3 (14 Mar 2007) diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest index 048fce78a70d..73c601780cfb 100644 --- a/app-text/sablotron/Manifest +++ b/app-text/sablotron/Manifest @@ -1,3 +1,10 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 1.0.3-libsablot-expat.patch 286 RMD160 a80fd29614a14b0a6b3e5fb800176c13c9ee63f8 SHA1 644b881c7f2658eaaea57c3df24dbffe4cb1179b SHA256 5721c00006a06a991bb171c85ffc794348bbe732bae68447a26457621eedda89 +MD5 755f1eacfce4753e0a585f5e76ef92f0 files/1.0.3-libsablot-expat.patch 286 +RMD160 a80fd29614a14b0a6b3e5fb800176c13c9ee63f8 files/1.0.3-libsablot-expat.patch 286 +SHA256 5721c00006a06a991bb171c85ffc794348bbe732bae68447a26457621eedda89 files/1.0.3-libsablot-expat.patch 286 DIST Sablot-1.0.1.tar.gz 485874 RMD160 2c52eecde29fe6913af00337dc2102995abaa78c SHA1 fbb41852bfc4b448d73b95c8cf951aa7f80c9d1b SHA256 e2d0c6b4a584a274a154a5c86ff751f66f915e7451a898a7ab6af632119d907c DIST Sablot-1.0.2.tar.gz 606814 RMD160 314b925c46c17d23ba21507ea56c414264f3581f SHA1 ac17c9c12077d429c6051df2de09a4ab974d3c58 SHA256 e0a6da46b89629cca907fac945a7ff6f6ec666aef6224c4b4cdea387cbd12406 DIST Sablot-1.0.3.tar.gz 607597 RMD160 bbf2b57d95efbe1fce0ba42813560df4dbde9e3a SHA1 4e60a6aef32b661d7887b3ffd28339f47e2565e1 SHA256 a0c737ada78d0d305a2a964595167e0c6d17ff0afd3b801714768deb681bf362 @@ -9,14 +16,14 @@ EBUILD sablotron-1.0.2.ebuild 1520 RMD160 1f23b60ee8c2dd453c07872d92e4d4f3953b87 MD5 98f59514f3d5be7c1d06e10cc0f61147 sablotron-1.0.2.ebuild 1520 RMD160 1f23b60ee8c2dd453c07872d92e4d4f3953b8795 sablotron-1.0.2.ebuild 1520 SHA256 ac43785476539252de351b2feadd0f071173b908e2e6810bc5f22605e64bd99b sablotron-1.0.2.ebuild 1520 -EBUILD sablotron-1.0.3.ebuild 1576 RMD160 9a41212929044eac8231161d9cd2dc872cdb2b00 SHA1 ef1d11ee940d20a009d0ab078c84546df82e61d8 SHA256 833ce282a22e211057564b88e65db2bdbaed65ae508d8ed8b2c1fc10a383f308 -MD5 1f6b9d042a22ea2b75c457ff5eba690d sablotron-1.0.3.ebuild 1576 -RMD160 9a41212929044eac8231161d9cd2dc872cdb2b00 sablotron-1.0.3.ebuild 1576 -SHA256 833ce282a22e211057564b88e65db2bdbaed65ae508d8ed8b2c1fc10a383f308 sablotron-1.0.3.ebuild 1576 -MISC ChangeLog 7394 RMD160 dd2edfd510f2150a9814f4aae314aaed5ae37eb3 SHA1 34c2640898e7b697c79cfa6ce2734835673c4744 SHA256 ebaf4ea8d844f430f0858a5d124f915881e391ba77a7265806ab9ffaec1cd088 -MD5 284a35e759fc55a0c6a5b97e50f53746 ChangeLog 7394 -RMD160 dd2edfd510f2150a9814f4aae314aaed5ae37eb3 ChangeLog 7394 -SHA256 ebaf4ea8d844f430f0858a5d124f915881e391ba77a7265806ab9ffaec1cd088 ChangeLog 7394 +EBUILD sablotron-1.0.3.ebuild 1658 RMD160 642807314a99fe3a7b11ed2196e64317a0c513e1 SHA1 c7dd42b1ed7b1094418e4539c8d2924f8a22cf05 SHA256 423e84fade9f8012890473c9bfb31616955fa7e732337c751ecf1a163a799ffd +MD5 00b18353e366f5fdddb3f381d99ff389 sablotron-1.0.3.ebuild 1658 +RMD160 642807314a99fe3a7b11ed2196e64317a0c513e1 sablotron-1.0.3.ebuild 1658 +SHA256 423e84fade9f8012890473c9bfb31616955fa7e732337c751ecf1a163a799ffd sablotron-1.0.3.ebuild 1658 +MISC ChangeLog 7567 RMD160 0acc1c22ec1334713f7e3a93022656864732de41 SHA1 c72785faa5fe8ca6df8b418b62630cd691a024f7 SHA256 189408bd96d5215d8c6494b6120e0dbc184127a40d9a1e4bb409291324e83885 +MD5 717691a5b9544965e7a9106c82d2c8ea ChangeLog 7567 +RMD160 0acc1c22ec1334713f7e3a93022656864732de41 ChangeLog 7567 +SHA256 189408bd96d5215d8c6494b6120e0dbc184127a40d9a1e4bb409291324e83885 ChangeLog 7567 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3 MD5 f6f50979d39d8d194c09b8f7833219aa metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 metadata.xml 159 @@ -30,3 +37,10 @@ SHA256 83a22239a0a0a406816150d48609713c4594eb813bc1b2e9c957be0b0675ff82 files/di MD5 5b1a39e38b02482c4fafb81e46cef873 files/digest-sablotron-1.0.3 238 RMD160 7dc298979b1d9ce925d38880cccf0a66352e4e61 files/digest-sablotron-1.0.3 238 SHA256 8cfc65647e09ed6adf93a31b00342796a0ecd78a2bdc425c18ca2b8defd3a050 files/digest-sablotron-1.0.3 238 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGJJ5xcxLzpIGCsLQRAlnGAJ9tmFnjuIqtZvImyPhqV+CpXodNCQCglO9l +YYUZbm93RZE1nJXH/KbYAco= +=YtY9 +-----END PGP SIGNATURE----- diff --git a/app-text/sablotron/files/1.0.3-libsablot-expat.patch b/app-text/sablotron/files/1.0.3-libsablot-expat.patch new file mode 100644 index 000000000000..328c9e906856 --- /dev/null +++ b/app-text/sablotron/files/1.0.3-libsablot-expat.patch @@ -0,0 +1,10 @@ +diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am +index abd2041..1307b1c 100644 +--- a/src/engine/Makefile.am ++++ b/src/engine/Makefile.am +@@ -76,4 +76,5 @@ include_HEADERS = \ + sabcfg.h + + libsablot_la_LDFLAGS = -version-info 100:3:100 ++libsablot_la_LIBADD = @EXPAT_LIBS@ + diff --git a/app-text/sablotron/sablotron-1.0.3.ebuild b/app-text/sablotron/sablotron-1.0.3.ebuild index 3d912c116b41..0a178a22989d 100644 --- a/app-text/sablotron/sablotron-1.0.3.ebuild +++ b/app-text/sablotron/sablotron-1.0.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/sablotron-1.0.3.ebuild,v 1.1 2007/03/14 02:16:28 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/sablotron-1.0.3.ebuild,v 1.2 2007/04/17 10:16:09 betelgeuse Exp $ -inherit libtool flag-o-matic +inherit base autotools flag-o-matic MY_PN="Sablot" MY_P="${MY_PN}-${PV}" @@ -22,15 +22,16 @@ RDEPEND=">=dev-libs/expat-1.95.6-r1" DEPEND="${RDEPEND} doc? ( >=dev-perl/XML-Parser-2.3 )" +PATCHES="${FILESDIR}/1.0.3-libsablot-expat.patch" src_compile() { # Don't use --without-html-dir, since that ends up installing files under # the /no directory local myconf="--with-html-dir=/usr/share/doc/${PF}/html" - # Please do not remove, else we get references to PORTAGE_TMPDIR - # in /usr/lib/libsablot.la ... - elibtoolize + # Please make sure at least elibtoolize is run, else we get references + # to PORTAGE_TMPDIR in /usr/lib/libsablot.la ... + eautoreconf use perl && myconf="${myconf} --enable-perlconnect" -- 2.26.2