Remove libgtkspell.la which is causing problems for libpng upgrade (unnecessary refer...

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

diff --git a/app-text/gtkspell/ChangeLog b/app-text/gtkspell/ChangeLog
index 1ce0fb33d8585bbe4afef14d053a912223c31a87..c9db5971e8c9368048c0e63c38732379ebe61871 100644 (file)
--- a/app-text/gtkspell/ChangeLog
+++ b/app-text/gtkspell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/gtkspell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/ChangeLog,v 1.87 2011/03/16 10:09:30 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/ChangeLog,v 1.88 2011/09/18 09:41:22 ssuominen Exp $
+
+  18 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> gtkspell-2.0.16.ebuild:
+  Remove libgtkspell.la which is causing problems for libpng upgrade
+  (unnecessary reference of -lpng14 in dependency_libs)
 
   16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   gtkspell-2.0.16.ebuild:

diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 79d0ba5312bd70c934a618dc8b2543510db16d60..3afc537da88138b632744ed85ec83bcb81006dcb 100644 (file)
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gtkspell-2.0.16.tar.gz 351277 RMD160 92c29780a43cd6fa2270d5ee77f9bc1ac09e56df SHA1 49a3eaff850d119a94fc929635270f01e87cdca1 SHA256 8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
-EBUILD gtkspell-2.0.16.ebuild 1215 RMD160 870e144a392fd400bd2babae809912e903627bfc SHA1 ea63cbd9e2d121c0bcc6c604a077147bff513498 SHA256 ebd06ac2e3bf7eda6abe49499f0a0c8990b72bec575edb547aac00ef2a627730
-MISC ChangeLog 10369 RMD160 8fd5554bbbd6ffe78d6ca5ba03b5199db9cda119 SHA1 d8ad92c29f2156ec6c314e05ca2d7ad0eecd01e4 SHA256 03bc133813c46ee783b465db1fc8c88a99f55cac29bee99e7cb9bb07ec390033
+EBUILD gtkspell-2.0.16.ebuild 1146 RMD160 fe6e823046b674b7dfd60b594d355c10e1b0a41e SHA1 ed680bef590f7b81b14737b18c3690b32dbf9b02 SHA256 85ef60579cb2bb3a7c8939dec4006a91ebf0283c6c7bdeba2c77ceafa33a17d1
+MISC ChangeLog 10574 RMD160 b1ae52f91d8e48c8c49ad02cbe76e713ec192f98 SHA1 e27ce074e881e07ff725a30460cbc5ac823a0113 SHA256 da8c1b976d5d999e1124f68e62180182e8810f596ff3f568d8beb042709dbeb7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk51vP8ACgkQXkR9YqOcLPGwNgEAorTtl0KwFn2VNMHgStNNtWV1
+Rxb8wbrLM6jsypSpbFkA/0oEbwKRThurJbJMSw2L9HAyR66ZJTl+uruIrLi48U8K
+=P6BO
+-----END PGP SIGNATURE-----

diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
index d40b72a19327bf499a6be2695206764a027c59d7..617ee681253b83a6560177332dd4e7dab40ee651 100644 (file)
--- a/app-text/gtkspell/gtkspell-2.0.16.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/gtkspell-2.0.16.ebuild,v 1.8 2011/03/16 10:09:30 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/gtkspell-2.0.16.ebuild,v 1.9 2011/09/18 09:41:22 ssuominen Exp $
 
-EAPI="2"
+EAPI=4
 
 DESCRIPTION="Spell checking widget for GTK2"
 HOMEPAGE="http://gtkspell.sourceforge.net/"
@@ -14,20 +14,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="doc"
 
-RDEPEND=">=x11-libs/gtk+-2:2
+RDEPEND="x11-libs/gtk+:2
        >=app-text/enchant-1.1.6"
-
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
        >=dev-util/intltool-0.35.0
-       doc? (
-               >=dev-util/gtk-doc-1
-               =app-text/docbook-xml-dtd-4.2* )"
+       doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.2 )"
+
+DOCS=( AUTHORS ChangeLog README ) # NEWS file is empty
 
 src_prepare() {
        # Fix intltoolize broken file, see upstream #577133
-       sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-               || die "sed failed"
+       sed -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in || die
 }
 
 src_configure() {
@@ -37,7 +35,6 @@ src_configure() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-       # not installing NEWS, it's empty
-       dodoc AUTHORS ChangeLog README || die "dodoc failed"
+       default
+       find "${ED}" -name '*.la' -exec rm -f {} +
 }