Version bump, bug #297731. Bug fixes and translation updates.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

3 files changed, 25 insertions, 43 deletions

diff --git a/app-text/gtkspell/ChangeLog b/app-text/gtkspell/ChangeLog
index a68fea9aa4ff..a9736a5c6aa1 100644
--- a/app-text/gtkspell/ChangeLog
+++ b/app-text/gtkspell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/gtkspell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/ChangeLog,v 1.78 2010/01/02 11:20:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/ChangeLog,v 1.79 2010/03/01 20:26:28 eva Exp $
+
+*gtkspell-2.0.16 (01 Mar 2010)
+
+  01 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtkspell-2.0.13.ebuild, -gtkspell-2.0.14.ebuild, +gtkspell-2.0.16.ebuild:
+  Version bump, bug #297731. Bug fixes and translation updates.
 
   02 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   gtkspell-2.0.15-r1.ebuild:
diff --git a/app-text/gtkspell/gtkspell-2.0.13.ebuild b/app-text/gtkspell/gtkspell-2.0.13.ebuild
deleted file mode 100644
index 7f4ef697b875..000000000000
--- a/app-text/gtkspell/gtkspell-2.0.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/gtkspell-2.0.13.ebuild,v 1.9 2008/09/26 16:49:16 jer Exp $
-
-inherit eutils
-
-DESCRIPTION="Spell checking widget for GTK2"
-HOMEPAGE="http://gtkspell.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-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* )"
-
-src_compile() {
-	econf $(use_enable doc gtk-doc) || die "configure failed"
-	emake || die "compile failure"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/app-text/gtkspell/gtkspell-2.0.14.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
index 67dd405807ba..aea730cbb650 100644
--- a/app-text/gtkspell/gtkspell-2.0.14.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/gtkspell-2.0.14.ebuild,v 1.6 2008/11/22 16:11:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/gtkspell-2.0.16.ebuild,v 1.1 2010/03/01 20:26:28 eva Exp $
 
-inherit eutils
+EAPI="2"
 
 DESCRIPTION="Spell checking widget for GTK2"
 HOMEPAGE="http://gtkspell.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+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
@@ -20,15 +20,24 @@ RDEPEND=">=x11-libs/gtk+-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.35.0
-	doc? ( >=dev-util/gtk-doc-1
+	doc? (
+		>=dev-util/gtk-doc-1
 		=app-text/docbook-xml-dtd-4.2* )"
 
-src_compile() {
-	econf $(use_enable doc gtk-doc)
-	emake || die "compile failure"
+src_prepare() {
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable doc gtk-doc)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+	# not installing NEWS, it's empty
+	dodoc AUTHORS ChangeLog README || die "dodoc failed"
 }