public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-dicts/gwaei/files/, app-dicts/gwaei/
@ 2016-09-18  9:58 Pacho Ramos
  0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2016-09-18  9:58 UTC (permalink / raw
  To: gentoo-commits

commit:     5b36c1787c7b9bef144189f69fc97678f15263c6
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 09:43:40 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 09:57:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b36c178

app-dicts/gwaei: Drop old

Package-Manager: portage-2.3.0

 app-dicts/gwaei/Manifest                           |  2 -
 app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch | 20 ------
 app-dicts/gwaei/gwaei-3.0.2.ebuild                 | 77 ----------------------
 app-dicts/gwaei/gwaei-3.2.0.ebuild                 | 69 -------------------
 4 files changed, 168 deletions(-)

diff --git a/app-dicts/gwaei/Manifest b/app-dicts/gwaei/Manifest
index 54e203a..11fa880 100644
--- a/app-dicts/gwaei/Manifest
+++ b/app-dicts/gwaei/Manifest
@@ -1,3 +1 @@
-DIST gwaei-3.0.2.tar.gz 821533 SHA256 1b27df77b38ea30680b9a93de64a93bf71631fd780b9277709854f797115c1dd SHA512 241460d59d0d47d9638d4b90f904a77efc922331f4a0c2bb7aec712841aa8766b8ee3bb0ac9d536db2611aec4dfb8287166a0b19f92afea645c34e6d797a489e WHIRLPOOL 5421a8f69210b3db67c8493dac1cb43e14952d7680eb64e45439af32d69f3b189c4815cebe6ced6de394f43092090d8610958b6ad4ca8339e70ba7e1dd001f1c
-DIST gwaei-3.2.0.tar.gz 841824 SHA256 7267f2fba1ee76e6ef6bfd76206c15ac0f9cb6169d70a610a14529f9bb10aded SHA512 7ac34d371910abe724c873d1279fdce42747c31ad53111176c42e878e688111554423357c84abab3ff4d0e316d0b8757a7440a0980e89efb81c173eab79164a0 WHIRLPOOL 1d203691c54b4e1fc775de3fa765e70495b29598713beee64a2057c1f1b0c8be3b20b2ecd0e21906917b8dd4bb01b8930801d8bbd554e9b59c6a5c2159df4930
 DIST gwaei-3.6.2.tar.xz 547592 SHA256 9904e1755505f9a40cd7368e96e1eeb035c6c2f7ce14029cccb765f5b85986d7 SHA512 96876f7e15ff5e166dcd116e2286294b7b375e55723684e4e3dec31aba46d1c89ccd70007fc01cab97a5fd5e671ec073c3f69525ff7e68126851e587d4f20c3b WHIRLPOOL 9bec5d65af285291a7d916b3e5b75b6c36e438486b942ded402f59e9b59244578157917a5066828fd8e97f20372a02509dedd77d414f7744855fc63feabf8031

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
deleted file mode 100644
index b614c21..00000000
--- a/app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 448be18..00000000
--- a/app-dicts/gwaei/gwaei-3.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 )
-	app-text/rarian
-	dev-util/intltool
-	virtual/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
-	fi
-}

diff --git a/app-dicts/gwaei/gwaei-3.2.0.ebuild b/app-dicts/gwaei/gwaei-3.2.0.ebuild
deleted file mode 100644
index 8219264..00000000
--- a/app-dicts/gwaei/gwaei-3.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 test"
-
-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
-	)
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/scrollkeeper-dtd
-	)
-	gtk? (
-		>=app-text/gnome-doc-utils-0.13.0
-	)
-	nls? ( >=sys-devel/gettext-0.17 )
-	app-text/rarian
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_with gtk gnome) \
-		$(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
-	fi
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-dicts/gwaei/files/, app-dicts/gwaei/
@ 2024-06-16 10:42 Pacho Ramos
  0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2024-06-16 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     e7a978de40f3e9cd1d05bb33434ab632d7e7bc3f
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 10:37:26 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 10:39:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7a978de

app-dicts/gwaei: Migrate to yelp

Stop using dead gnome-doc-utils

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 app-dicts/gwaei/files/gwaei-3.6.2-yelp.patch | 53 +++++++++++++++++
 app-dicts/gwaei/gwaei-3.6.2-r1.ebuild        | 86 ++++++++++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/app-dicts/gwaei/files/gwaei-3.6.2-yelp.patch b/app-dicts/gwaei/files/gwaei-3.6.2-yelp.patch
new file mode 100644
index 000000000000..a5515561fd59
--- /dev/null
+++ b/app-dicts/gwaei/files/gwaei-3.6.2-yelp.patch
@@ -0,0 +1,53 @@
+---
+ autogen.sh                 |    1 -
+ configure.ac               |    4 +---
+ src/gwaei/help/Makefile.am |    5 +++--
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+--- gwaei.git.orig/configure.ac
++++ gwaei.git/configure.ac
+@@ -73,8 +73,6 @@ AM_CONDITIONAL([WITH_MECAB], [test x$mec
+ 
+ AC_CHECK_LIB(m, sqrt)
+ 
+-GNOME_DOC_INIT(,,[:]) 
+-
+ PKG_CHECK_MODULES(LIBWAEI, glib-2.0           >= $GLIB_REQUIRED_VERSION
+                            gobject-2.0        >= $GLIB_REQUIRED_VERSION
+                            gio-2.0            >= $GIO_REQUIRED_VERSION
+@@ -103,7 +101,7 @@ if test x$gnome = xtrue; then
+                            libcurl            >= $LIBCURL_REQUIRED_VERSION )
+   AC_SUBST(GWAEI_CFLAGS)
+   AC_SUBST(GWAEI_LIBS)
+-  GNOME_DOC_INIT
++  YELP_HELP_INIT
+ fi
+ 
+ if test x$hunspell = xtrue; then
+--- gwaei.git.orig/src/gwaei/help/Makefile.am
++++ gwaei.git/src/gwaei/help/Makefile.am
+@@ -2,10 +2,12 @@ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ datadir = @datadir@
+ 
+-include $(top_srcdir)/gnome-doc-utils.make
++@YELP_HELP_RULES@
+ dist-hook: doc-dist-hook
+-DOC_MODULE = gwaei
++HELP_MODULE = gwaei
++HELP_ID = gwaei
+ 
++HELP_FILES=glossary.xml gwaei.xml
+ cglossarydir = $(datadir)/gnome/help/$(PACKAGE)/C
+ cglossary_DATA = C/glossary.xml
+ EXTRA_DIST = C/glossary.xml
+--- gwaei.git.orig/autogen.sh
++++ gwaei.git/autogen.sh
+@@ -6,7 +6,6 @@ touch ChangeLog
+ libtoolize --force
+ glib-gettextize --copy --force
+ intltoolize --copy --force --automake
+-gnome-doc-prepare --copy --force
+ aclocal -I m4 --force
+ autoheader -f
+ automake --copy --force --add-missing

diff --git a/app-dicts/gwaei/gwaei-3.6.2-r1.ebuild b/app-dicts/gwaei/gwaei-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..0939ac61c424
--- /dev/null
+++ b/app-dicts/gwaei/gwaei-3.6.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools gnome2-utils xdg
+
+DESCRIPTION="Japanese-English Dictionary for GNOME"
+HOMEPAGE="https://github.com/zakkudo/gwaei"
+SRC_URI="https://downloads.sourceforge.net/gwaei/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="gtk hunspell nls mecab test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-misc/curl-7.20.0
+	>=dev-libs/glib-2.31
+	gtk? (
+		x11-libs/gtk+:3
+		app-text/yelp-tools
+	)
+	hunspell? ( app-text/hunspell )
+	nls? ( virtual/libintl )
+	mecab? ( app-text/mecab )"
+DEPEND="${RDEPEND}
+	gtk? (
+		x11-themes/gnome-icon-theme-symbolic
+		app-text/yelp-tools
+	)"
+BDEPEND="
+	app-text/rarian
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.17 )
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/scrollkeeper-dtd
+	)"
+
+PATCHES=(
+	# Migrate away from gnome-doc-utils (from Debian)
+	"${FILESDIR}/${P}-yelp.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with gtk gnome) \
+		$(use_enable nls) \
+		$(use_with hunspell) \
+		$(use_with mecab)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk; then
+		gnome2_schemas_savelist
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_pkg_postinst
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_pkg_postrm
+	fi
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-06-16 10:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-18  9:58 [gentoo-commits] repo/gentoo:master commit in: app-dicts/gwaei/files/, app-dicts/gwaei/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2024-06-16 10:42 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox