Fix building with libtool-2.4 #342669 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 56 insertions, 8 deletions

diff --git a/app-text/dictd/ChangeLog b/app-text/dictd/ChangeLog
index 218958c25d11..40b21e1bacb0 100644
--- a/app-text/dictd/ChangeLog
+++ b/app-text/dictd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/dictd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.88 2011/06/28 10:22:14 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.89 2012/02/09 00:06:47 vapier Exp $
+
+  09 Feb 2012; Mike Frysinger <vapier@gentoo.org> dictd-1.12.0.ebuild,
+  +files/dictd-1.12.0-build.patch:
+  Fix building with libtool-2.4 #342669 by Diego Elio Pettenò.
 
 *dictd-1.12.0 (28 Jun 2011)
 
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index be28b51ea47e..97731e54a008 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.10.11/colorit.conf 848 RMD160 cebf4cd68e62ee6218bb39f88c655d3bacaa3c25 SHA1 47f9188eee886463c13c853831d073d1711c0392 SHA256 54969fbc6e782013c086e3055f0fa1989ddeb71f5b87e94205d82cefee657d8f
 AUX 1.10.11/dict.conf 243 RMD160 5adc267e57f7a4e526d2b6d7ef43ed712d1e6a19 SHA1 acaad0d56fc7fa4f3cc48152ad13cbba265c8faa SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57
 AUX 1.10.11/dictd.conf 563 RMD160 18b435b7ef4ca3a8da6f38706965857bc1d0e28e SHA1 839fbbb050069cd4600e0cf18580e4b6ae64c43c SHA256 06f1c42afd56a98a736cc252f0271889030d8b57754bc4054905e318508d5e37
@@ -5,11 +8,29 @@ AUX 1.10.11/dictd.confd 204 RMD160 5f8e7e3d62691046beb21db7a589933c9087c2a0 SHA1
 AUX 1.10.11/dictd.initd 2093 RMD160 8aa780263971d16dda4580c099694d71aaa0ee85 SHA1 aeeb255d23804a5811764804578afc9fa0b6fb5f SHA256 9e8c721bbd53fe0c27eb7c6cada8c0e0c89eccde16bfa6f483f10581e7115e2a
 AUX 1.10.11/site.info 235 RMD160 3bee51beb2ad856a6de1941764158f558c124733 SHA1 5de46179c02e3cf7a6f5360e5399b089db30878d SHA256 cb55e7aaedef73665996f015a07e97e45cd3771775e291d798bf163b0052c0a2
 AUX dictd-1.10.11-colorit-nopp-fix.patch 323 RMD160 86c6559ff0518e282bed264310b6e216757a050d SHA1 7fda8a2d25e3df2de66e9f100c710c40db12f29b SHA256 720962dbe93456a948c489dd7ecc1f8384169b88c7a662ffee960b5eab4c7409
+AUX dictd-1.12.0-build.patch 643 RMD160 580c1ed124120dac998f1f97a4fd9f6219f45b5b SHA1 8c1dfaaedb30473b3fa48aaaa0223d40abeb035b SHA256 332769df227f6269eb2b134400f9cf2281f46ef30844d5517732f663b9f40000
 DIST dictd-1.11.1.tar.gz 416958 RMD160 a212c56b7316751c3501f38bee62bd2e9e097afb SHA1 48a98addfea83faed2b8890b1e1bae22d51d9113 SHA256 0d948667e077a82bc8bfa363243b2a39efb6d469f235ce64f4f3aa9e4682da37
 DIST dictd-1.11.2.tar.gz 418649 RMD160 f93e8a7a0bbb4e1812288d2ed16889a60e8973ba SHA1 11087cfeffed4e19991e54561d2a6eca1b18d651 SHA256 60e7f44259adee87e952ea5d7e87555685224fb1d1dca24d3735b9feb58c871f
 DIST dictd-1.12.0.tar.gz 423183 RMD160 56abaebf57baabcb72b96ccf6ec5c39cc3a67ceb SHA1 0a1b0c4103e5c3c8b749f9a5dc005cb70e4639e8 SHA256 5ec423d29c46e088cf3617ea86fea74d7f70c48f66b142b7f477b55a3ef4a4a2
 EBUILD dictd-1.11.1-r1.ebuild 2763 RMD160 ea9bb63d727451f36bda74da83398632f8674ed8 SHA1 a8be1de335fad53cc859730cae23e3e0521a31b6 SHA256 ca2bb098edd5b89c52327701a4ab4486915b515b0819ffff69eaa01641366432
 EBUILD dictd-1.11.2.ebuild 2933 RMD160 c96630a65bf20d23a99be57a04fbb443ae3f72ab SHA1 149484ebeac4d670cea80c0b4b66fd9ebe144a85 SHA256 1721509806ba5b200796aabf9128b598637ee715141672a09e3496b8ca2f4158
-EBUILD dictd-1.12.0.ebuild 2604 RMD160 49691dcdc47fbcaa84456b03f83548f116c27c7f SHA1 3a18e5f2b1fe4d4e7f4f6f8156c35061a97f8193 SHA256 148c8c4ec712d2a891d590c3e28b395beb5e96ded73c852ab8fe4f55e8643a6d
-MISC ChangeLog 14819 RMD160 1e8a12263a8dcbc84d3aa88f157bf8e57250808c SHA1 7fd338accdc2985366aa085caf80825c9adce0d2 SHA256 b9b89ba0aeecc9dc7f433f5adfa2580103c524f6ff5cd02a9bd7194785d8313d
+EBUILD dictd-1.12.0.ebuild 2692 RMD160 4e4b134e2eb6bf52e7e374c30bc97752ceb3c356 SHA1 5983c3021aad73b95badc5ef6d5cd557b06c0356 SHA256 462f13a74ba69ced4dd2abbf7b96bc258c759bb27cde74c4e5e06c5fe3e91afc
+MISC ChangeLog 14993 RMD160 7e9954c411d17e005e4dfc5546284559b824dd8e SHA1 37cfd81fc1bbe5e0875af1c47398e9d237077f13 SHA256 82398f20aeccd3a437579a861e99cb911e7f07a1d00d7dd4767e27276b889740
 MISC metadata.xml 403 RMD160 27dbd8981c704fbd807a2ff1a2888389d655a776 SHA1 25130136d5d503c6409f8d88ddbee4154d862886 SHA256 c849b2fbde0b28c225ce1524495905e5d7251c2a6cceeeb89c3e2a56b9f0bb6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPMw4gAAoJELEHsLL7fEFWfnEP/ijn0vVUkWLMAyFu7SNAPQhb
+6dchUvsJmpsL7N8YY5ZZWUbfKNvTyg0sR95rEGPge+V7H3Y645IgeSNh4V7UCuOs
+0qveRXoQoov/9B8jRP/hwJWC2m9EhsZC9Wp6qkboO8zyzlthUpd55hu/5DnX7kKs
+am5fi9KDwtHiNYB9fko3PYlTMvr59i0AMdoky2xv9q8XJoXrrDq0rCW6RjUlOce4
+Uz8Q9foIkrKX7DE1OAtyFJo0KchMv78o0i1ZQrnogCLI4MzAb1SyKRVJLbYaZ6iY
+l+xqCCAITIuVFvs3lmPMEJW5wy+L5fluer/xhsEmgLrlN9hvhNjbCZGGjzx+j7xS
+wL5e3OWTarIKvkSJep8b4wrvVgThykXgUvdxPAvCnXx/0wMb5zPjbW5NP2WlSX4u
+yUJvOPL+rVNeJU9YxrGxLm7SdNvSXmVGiuzxyhnGfsfzywFn5KsxK9zglUksHTky
+pNuoHhisjIIzqjHZu9R24FS8yhehwlWr2Kvr48LyswnMzE9UK7UQdIuo7ZSDGr/A
+1S0Lw2YHOMUmwJA7gYlyl5xRgMhyA435LHbjD3qX9N/W4Z2Kaer8owfWlK8IHZbi
+/eC49Hhl59mcJX1ji46nc9q72nshPbyD4LlWASk95mMgQKZqMG/PUtL0nPeKdc8v
+SWTH06Rc5edv3KYopBBT
+=yUzw
+-----END PGP SIGNATURE-----
diff --git a/app-text/dictd/dictd-1.12.0.ebuild b/app-text/dictd/dictd-1.12.0.ebuild
index 1e39df902efa..b5977b0461bf 100644
--- a/app-text/dictd/dictd-1.12.0.ebuild
+++ b/app-text/dictd/dictd-1.12.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.12.0.ebuild,v 1.1 2011/06/28 10:22:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.12.0.ebuild,v 1.2 2012/02/09 00:06:47 vapier Exp $
 
 EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="Dictionary Client/Server for the DICT protocol"
-HOMEPAGE="http://www.dict.org/"
+HOMEPAGE="http://www.dict.org/ http://sourceforge.net/projects/dict/"
 SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 
 SLOT="0"
@@ -32,7 +32,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/dictd-1.10.11-colorit-nopp-fix.patch"
+	epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+	epatch "${FILESDIR}"/dictd-1.12.0-build.patch
 
 	[[ ${CHOST} == *-darwin* ]] && \
 		sed -i -e 's:libtool:glibtool:g' Makefile.in
diff --git a/app-text/dictd/files/dictd-1.12.0-build.patch b/app-text/dictd/files/dictd-1.12.0-build.patch
new file mode 100644
index 000000000000..d192f8ccb961
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.12.0-build.patch
@@ -0,0 +1,22 @@
+don't force -static so we get both pic and non-pic objects
+
+https://bugs.gentoo.org/342669
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -117,12 +117,12 @@
+ @SET_MAKE@
+ 
+ %.o: %.c
+-	$(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@ -static
+ %.o: %.cpp
+-	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $< -o $@
++	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $< -o $@ -static
+ 
+ %: %.o
+-	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ \
+ 		$^ $(OBJS) $(LDFLAGS) -lz ${LIBS}
+ 
+ include $(srcdir)/deps