Version bump to 3.0.2 (uses Gtk+ 3); add ncurses USE flag; remove static libraries and .la files. Closes bug #349270.

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

5 files changed, 125 insertions, 25 deletions

diff --git a/app-dicts/gwaei/ChangeLog b/app-dicts/gwaei/ChangeLog
index 469b7829046d..94e93fd8c502 100644
--- a/app-dicts/gwaei/ChangeLog
+++ b/app-dicts/gwaei/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-dicts/gwaei
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/ChangeLog,v 1.22 2011/03/27 10:10:42 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/ChangeLog,v 1.23 2011/08/30 23:07:15 flameeyes Exp $
+
+*gwaei-3.0.2 (30 Aug 2011)
+
+  30 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> +gwaei-3.0.2.ebuild,
+  +files/gwaei-3.0.2-no-ncurses.patch, metadata.xml:
+  Version bump to 3.0.2 (uses Gtk+ 3); add ncurses USE flag; remove static
+  libraries and .la files. Closes bug #349270.
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gwaei-1.0.ebuild,
   gwaei-1.1.ebuild:
diff --git a/app-dicts/gwaei/Manifest b/app-dicts/gwaei/Manifest
index 1c1985ee5cb3..60583e27af7d 100644
--- a/app-dicts/gwaei/Manifest
+++ b/app-dicts/gwaei/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gwaei-3.0.2-no-ncurses.patch 544 RMD160 443805671f27bbf6c35478a78b2b28bd189f645d SHA1 8747561d57a822adb6afaa0a4d7c773970583523 SHA256 efe60a7d502e2edc458eaad8037b513cb61492f1e568d036518b1e563c84f47d
 DIST gwaei-1.0.tar.gz 545062 RMD160 507ad0d7cfb35effbe30098a7c6d17335fe700b6 SHA1 2a75a2cb714168fce436bf6df29f6165e7ce4715 SHA256 e4ba48ffe3bcfac2f484d20b57d397706da293c83dc54528aa278721f3afef4d
 DIST gwaei-1.1.tar.gz 590868 RMD160 1d46277765613ab8d3d2d288bed4a61fcc4b8a47 SHA1 3da0592d253c3e9e7f020bc1fe5d8c4330fe4ef4 SHA256 3ced895e0ff7d0e716af015425739a9fe2968f5f3ebdd14bd60aa7a25ad59567
+DIST gwaei-3.0.2.tar.gz 821533 RMD160 dc7cfb1983c20bde24661ca5cd12b0cffedb43a9 SHA1 541aade83835f542a70d435291978f5249ba63ab SHA256 1b27df77b38ea30680b9a93de64a93bf71631fd780b9277709854f797115c1dd
 EBUILD gwaei-1.0.ebuild 1216 RMD160 732c9e6ca185dae8d1f68c3d8eaf5533672d23f4 SHA1 2bd39cf0d7052b48b75231b2d068860eb1e2b69b SHA256 577f2d77ae5fa384544ac42a6b7cb7294994c79bcfe99125dda63f0cc896b0d9
 EBUILD gwaei-1.1.ebuild 1263 RMD160 cd660a00a101475ec8505136d04faf7fee92cf7b SHA1 4df79dde091809dd3bda0fe77284b746ab42addd SHA256 c20ac9c9a955b1feb3e18866e58d285c84afd2f0d80fc68803238127da351479
-MISC ChangeLog 3895 RMD160 90b23f16ae7f7de937e88b2e112fe420105ceaf3 SHA1 f5f7d9c74fb288a9f929bbd28dfbfe93b519af5a SHA256 20e0315d0ab171555f12e1b3b31d85bc5e881acaa777bd99eb70a8919556a761
-MISC metadata.xml 416 RMD160 4cad4d7793bd8f91986b1ae79b85e03dc3b29a0b SHA1 814c0aab492dad11512d5b63c0ea44e48d64cfac SHA256 08c7bf5fe8320b7bcad6e7e0734db652c301dfe03732257207fe85f64d5a793b
+EBUILD gwaei-3.0.2.ebuild 1507 RMD160 9916feb1c5c9f73152e7322d7f27d23796fdb930 SHA1 9e7afec27af0c7f01da7c0c43279403934befec3 SHA256 07ffacad29efce1d4d16f62352cd5ece7574ce75f763c7260add1585a09b3ede
+MISC ChangeLog 4177 RMD160 98ea1e8655dab906dfd18ba3542a678217cbf778 SHA1 a2fd081a5dc632d95777b919b75bcb00270b630b SHA256 9c27b00199677a895eac11a24248a22789198bdbd0ea0d58f38108457379ec71
+MISC metadata.xml 563 RMD160 30e5b8451d78bc5a3b4cefd585dce125f667d21d SHA1 6a2a6a8e1df42d20be25cae4b8d2d1c083029c73 SHA256 616ea972bdb6f1cb188ec1409a4f743bb91f168e9e5b5323ebb9f7bc8f6f890d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjw0oAAoJEO/kOhxWD91kHv8QAJ54vs8KbVZTytJ+NKhiTl8i
-PvCuhKKDPp2t6LBFNb+uPgrtO8jDW0dKnqZm9YCDpDMKl6ckvSpSYQRIa0oAsoZW
-Szc+jVCtiJJJWo7Gqz4vc8ep3XvTjlgI05X6B45M147zsPl25GlElutzMvGaydfb
-w8sxclio4/tCVDxGe90B9TJctXTKkmFDzLuPiE+Xxczl3BjAg11y7IRW6TlZyIUe
-RSUx3SPkl7I8KW4ZozMhPmzyj3sU5u70wT+Ov0kIAJspz6PmWfVcYRYnq98nB3ql
-2rId5nLOC4/MgpXGNFYCS3/U5H6KGSfwIFzRyMUCxKWgrSPVH8M8kQHRTftOC9Vm
-HJt+KDhZhaFT5wo3AxCP2QaEFcgotXpfIzlDD4ik1Rnf8FZoWIhOwNrAp6zfyJ9R
-oL0k8YH3S0hkgR2o4wwca87Z7PpHOkl7IVRgClKjjRGGIz/wNWggvCfrUyG01CLg
-2sRmNlZuYY/3vpdmHWUHg5CKpEXUTzX2Z4Dn/YsT7B9KEY28oSeTYlHPZemmOfK1
-8nf8KWfGHFuX90e19fQfnlkDUFstG2kS9fxNvvSDY8sJZHcSrkT3sHtGm6OCrKsS
-4TUdKhL+fOLX5tgCDf0SUeGosdmaqmn4aCsj5q3wSwcZqFq3T69LZAqZYROjgSrW
-45Lg6eHGF+O7tgi+gX3V
-=7Oqc
+iEYEARECAAYFAk5dbRYACgkQAiZjviIA2Xg5MQCglohw1HJeQCvdBSgoMCWN9kJK
+8OUAmwQo9WnzUZVIUSQdwlC7GaZu1WKu
+=SCBj
 -----END PGP SIGNATURE-----
diff --git a/app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch b/app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch
new file mode 100644
index 000000000000..b614c218d309
--- /dev/null
+++ b/app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch
@@ -0,0 +1,20 @@
+Index: gwaei-3.0.2/src/waei/waei.c
+===================================================================
+--- gwaei-3.0.2.orig/src/waei/waei.c
++++ gwaei-3.0.2/src/waei/waei.c
+@@ -195,6 +195,7 @@ int w_start_console (int argc, char* arg
+ }
+ 
+ 
++#ifdef WITH_NCURSES
+ //!
+ //! @brief Equivalent to the main function for many programs.  This is what starts the program
+ //! @param argc Your argc from your main function
+@@ -219,6 +220,7 @@ int w_start_ncurses (int argc, char* arg
+ 
+     return TRUE;
+ }
++#endif
+ 
+ 
+ int main (int argc, char *argv[])
diff --git a/app-dicts/gwaei/gwaei-3.0.2.ebuild b/app-dicts/gwaei/gwaei-3.0.2.ebuild
new file mode 100644
index 000000000000..d56caccde170
--- /dev/null
+++ b/app-dicts/gwaei/gwaei-3.0.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/gwaei-3.0.2.ebuild,v 1.1 2011/08/30 23:07:15 flameeyes Exp $
+
+EAPI="4"
+
+inherit gnome2-utils eutils
+
+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="gtk nls unique test ncurses"
+
+RDEPEND=">=net-misc/curl-7.21.0
+	>=dev-libs/glib-2.25.0:2
+	gtk? (
+		x11-libs/gtk+:3
+		>=app-text/gnome-doc-utils-0.13.0
+		unique? ( dev-libs/libunique:3 )
+	)
+	ncurses? ( sys-libs/ncurses[unicode] )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	test? ( app-text/docbook-xml-dtd:4.1.2 )
+	gtk? (
+		>=app-text/gnome-doc-utils-0.13.0
+		app-text/scrollkeeper
+	)
+	nls? ( >=sys-devel/gettext-0.17 )
+	dev-util/pkgconfig"
+
+REQUIRED_USE="unique? ( gtk )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-ncurses.patch
+}
+
+src_configure() {
+	econf \
+		$(use_with gtk gnome) \
+		$(use_with ncurses) \
+		$(use_with unique libunique) \
+		$(use_enable nls) \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	find "${D}" -name '*.la' -delete
+
+	dodoc AUTHORS README
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_schemas_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		gnome2_schemas_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_schemas_update --uninstall
+	fi
+}
diff --git a/app-dicts/gwaei/metadata.xml b/app-dicts/gwaei/metadata.xml
index 077e55ccee9f..3a976493c3a4 100644
--- a/app-dicts/gwaei/metadata.xml
+++ b/app-dicts/gwaei/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<longdescription lang="en">
-  gWaei is a drop-in replacement for Gjiten. The main
-  feature of this dictonary program is regular expression
-  support. For example, you can use periods in place of
-  unknown Kanji of a word to search for it.
-</longdescription>
+  <herd>cjk</herd>
+  <longdescription lang="en">
+    gWaei is a drop-in replacement for Gjiten. The main feature of
+    this dictonary program is regular expression support. For example,
+    you can use periods in place of unknown Kanji of a word to search
+    for it.
+  </longdescription>
+  <use>
+    <flag name='unique'>
+      Enable single instance support using
+      <pkg>dev-libs/libunique</pkg>.
+    </flag>
+  </use>
 </pkgmetadata>
-