Version bumped. Added gnome USE flag. Removed old versions.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

5 files changed, 81 insertions, 71 deletions

diff --git a/app-dicts/gwaei/ChangeLog b/app-dicts/gwaei/ChangeLog
index 1f22989d9a99..25e1b2b9d075 100644
--- a/app-dicts/gwaei/ChangeLog
+++ b/app-dicts/gwaei/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-dicts/gwaei
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/ChangeLog,v 1.9 2009/02/13 15:45:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/ChangeLog,v 1.10 2009/03/02 14:55:11 matsuu Exp $
+
+*gwaei-0.15.1 (02 Mar 2009)
+
+  02 Mar 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +files/gwaei-0.15.1-parallel-install.patch, -gwaei-0.13.2.ebuild,
+  -gwaei-0.14.0.ebuild, +gwaei-0.15.1.ebuild:
+  Version bumped. Added gnome USE flag. Removed old versions.
 
 *gwaei-0.14.0-r1 (13 Feb 2009)
 
diff --git a/app-dicts/gwaei/files/gwaei-0.15.1-parallel-install.patch b/app-dicts/gwaei/files/gwaei-0.15.1-parallel-install.patch
new file mode 100644
index 000000000000..93ac281ae99a
--- /dev/null
+++ b/app-dicts/gwaei/files/gwaei-0.15.1-parallel-install.patch
@@ -0,0 +1,12 @@
+diff -Naur gwaei-0.15.1.orig/src/Makefile.am gwaei-0.15.1/src/Makefile.am
+--- gwaei-0.15.1.orig/src/Makefile.am	2009-03-01 11:46:31.000000000 +0900
++++ gwaei-0.15.1/src/Makefile.am	2009-03-02 12:35:52.000000000 +0900
+@@ -10,7 +10,7 @@
+ install-data-local: install-symbolic-link
+ uninstall-local: uninstall-symbolic-link
+ 
+-install-symbolic-link:
++install-symbolic-link: install-binPROGRAMS
+ 	rm -f $(DESTDIR)$(bindir)/waei
+ 	cp $(DESTDIR)$(bindir)/gwaei $(DESTDIR)$(bindir)/waei
+ uninstall-symbolic-link:
diff --git a/app-dicts/gwaei/gwaei-0.13.2.ebuild b/app-dicts/gwaei/gwaei-0.13.2.ebuild
deleted file mode 100644
index 92c8b19865ce..000000000000
--- a/app-dicts/gwaei/gwaei-0.13.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/gwaei-0.13.2.ebuild,v 1.1 2009/01/19 12:12:31 matsuu Exp $
-
-inherit gnome2
-
-DESCRIPTION="Japanese-English Dictionary for GNOME"
-HOMEPAGE="http://gwaei.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gwaei/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.12
-	>=gnome-base/libgnome-2.22
-	>=gnome-base/libgnomeui-2.22
-	>=gnome-base/gconf-2.22
-	>=net-misc/curl-7.18
-	>=dev-libs/glib-2.16
-	>=x11-libs/libsexy-0.1.11
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.17 )
-	dev-util/pkgconfig"
-
-G2CONF="$(use_enable nls) --disable-schemas-install"
-
-src_install() {
-	gnome2_src_install
-
-	rm -rf "${D}/usr/share/doc/${P}"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-dicts/gwaei/gwaei-0.14.0.ebuild b/app-dicts/gwaei/gwaei-0.14.0.ebuild
deleted file mode 100644
index 8f3295aef55d..000000000000
--- a/app-dicts/gwaei/gwaei-0.14.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/gwaei-0.14.0.ebuild,v 1.1 2009/01/27 16:17:54 matsuu Exp $
-
-inherit gnome2
-
-DESCRIPTION="Japanese-English Dictionary for GNOME"
-HOMEPAGE="http://gwaei.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gwaei/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.12
-	>=gnome-base/libgnome-2.22
-	>=gnome-base/libgnomeui-2.22
-	>=gnome-base/gconf-2.22
-	>=net-misc/curl-7.18
-	>=dev-libs/glib-2.16
-	>=x11-libs/libsexy-0.1.11
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.17 )
-	dev-util/pkgconfig"
-
-G2CONF="$(use_enable nls) --disable-schemas-install"
-
-src_install() {
-	gnome2_src_install
-
-	rm -rf "${D}/usr/share/doc/${P}"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-dicts/gwaei/gwaei-0.15.1.ebuild b/app-dicts/gwaei/gwaei-0.15.1.ebuild
new file mode 100644
index 000000000000..a03837ab782e
--- /dev/null
+++ b/app-dicts/gwaei/gwaei-0.15.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/gwaei-0.15.1.ebuild,v 1.1 2009/03/02 14:55:11 matsuu Exp $
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="Japanese-English Dictionary for GNOME"
+HOMEPAGE="http://gwaei.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gwaei/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome libsexy nls"
+
+RDEPEND=">=x11-libs/gtk+-2.12
+	>=net-misc/curl-7.18
+	>=dev-libs/glib-2.16.5
+	gnome? (
+		>=gnome-base/libgnome-2.22
+		>=gnome-base/gconf-2.22
+	)
+	libsexy? ( >=x11-libs/libsexy-0.1.11 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.17 )
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-parallel-install.patch"
+	eautomake
+}
+
+src_compile() {
+	econf \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome) \
+		$(use_enable libsexy) \
+		$(use_enable nls) \
+		--disable-schemas-install || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	rm -rf "${D}/usr/share/doc/${P}"
+	dodoc AUTHORS ChangeLog NEWS README
+}
+pkg_preinst() {
+	if use gnome ; then
+		gnome2_gconf_savelist
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+}