Fixed dependency, bug #303001. Clean up.

(Portage version: 2.1.9.31/cvs/Linux x86_64)

4 files changed, 181 insertions, 2 deletions

diff --git a/app-i18n/zhcon/ChangeLog b/app-i18n/zhcon/ChangeLog
index 4d8c5f7b9186..7848a8ec811f 100644
--- a/app-i18n/zhcon/ChangeLog
+++ b/app-i18n/zhcon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/zhcon
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/ChangeLog,v 1.16 2010/07/09 08:38:07 tove Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/ChangeLog,v 1.17 2011/01/25 14:25:17 matsuu Exp $
+
+*zhcon-0.2.6-r2 (25 Jan 2011)
+
+  25 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> +zhcon-0.2.6-r2.ebuild,
+  +files/zhcon-0.2.6-automagic-fix.patch, +files/zhcon-0.2.6.make-fix.patch:
+  Fixed dependency, the patch is submitted by Kacper Kowalik, bug #303001.
+  Clean up.
 
   09 Jul 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Update metadata.xml. antarus is staffer now (#119161)
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
new file mode 100644
index 000000000000..5b4b24137f1e
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
@@ -0,0 +1,36 @@
+--- zhcon-0.2.5.orig/configure.in	2010-01-31 15:12:10.521592172 +0100
++++ zhcon-0.2.5/configure.in	2010-01-31 15:12:33.939593092 +0100
+@@ -170,18 +170,25 @@
+ dnl-----------------------------------------------------------------------
+ dnl Checks for gpm
+ dnl-----------------------------------------------------------------------
+-usegpm="yes"
+-AC_CHECK_HEADERS(gpm.h,,usegpm="no")
+-AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
++AC_ARG_WITH([gpm], AS_HELP_STRING([--without-gpm], [Build without gpm library (default: test)]))
++
++usegpm='no'
++if test "x$with_gpm" != "xno"; then
++    AC_CHECK_HEADERS(gpm.h,,AC_ERROR([gpm.h not found]))
++    AC_CHECK_LIB(gpm,Gpm_Open,,AC_ERROR([libgpm not found]))
++    usegpm='yes'
++fi
+ 
+ dnl-----------------------------------------------------------------------
+ dnl Checks for libggi
+ dnl-----------------------------------------------------------------------
+-useggi="yes"
+-AC_CHECK_HEADERS(ggi/ggi.h,,useggi="no")
+-AC_CHECK_LIB(ggi, main,,useggi="no")
+-if test "$useggi" = 'yes';then
+-	AC_DEFINE(HAVE_GGI_LIB)
++AC_ARG_WITH([ggi], AS_HELP_STRING([--without-ggi], [Build without ggi library (default: test)]))
++
++useggi='no'
++if test "x$with_ggi" != "xno"; then
++    AC_CHECK_HEADERS(ggi/ggi.h,,AC_ERROR([ggi.h not found]))
++    AC_CHECK_LIB(ggi, ggiInit,, AC_ERROR([libggi not found]))
++    useggi='yes'
+ fi
+ 
+ AC_OUTPUT([Makefile
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
new file mode 100644
index 000000000000..ccde407ef81a
--- /dev/null
+++ b/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
@@ -0,0 +1,82 @@
+diff -Naur zhcon-0.2.5.orig/doc/Makefile.am zhcon-0.2.5/doc/Makefile.am
+--- zhcon-0.2.5.orig/doc/Makefile.am	2006-05-03 02:57:18.000000000 +0900
++++ zhcon-0.2.5/doc/Makefile.am	2011-01-25 18:08:26.483746175 +0900
+@@ -3,8 +3,8 @@
+ EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(mandir)/man1/
+-	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
++	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1
+ 
+ uninstall-local:
+-	-rm -f $(mandir)/man1/zhcon.1
++	-rm -f $(DESTDIR)$(mandir)/man1/zhcon.1
+diff -Naur zhcon-0.2.5.orig/font/Makefile.am zhcon-0.2.5/font/Makefile.am
+--- zhcon-0.2.5.orig/font/Makefile.am	2006-04-25 01:39:04.000000000 +0900
++++ zhcon-0.2.5/font/Makefile.am	2011-01-25 18:08:26.483746175 +0900
+@@ -1,8 +1,8 @@
+ EXTRA_DIST = *.bpsf
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(libdir)/zhcon/font/
+-	$(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/
++	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
++	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
+ 
+ uninstall-local:
+-	-rm -f $(libdir)/zhcon/font/*.bpsf
++	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
+diff -Naur zhcon-0.2.5.orig/input/Makefile.am zhcon-0.2.5/input/Makefile.am
+--- zhcon-0.2.5.orig/input/Makefile.am	2006-04-25 01:38:44.000000000 +0900
++++ zhcon-0.2.5/input/Makefile.am	2011-01-25 18:08:26.483746175 +0900
+@@ -1,8 +1,8 @@
+ EXTRA_DIST = *.mb
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(libdir)/zhcon/input/
+-	$(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/
++	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
++	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
+ 
+ uninstall-local:
+-	-rm -f $(libdir)/zhcon/input/*.mb
++	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
+diff -Naur zhcon-0.2.5.orig/src/Makefile.am zhcon-0.2.5/src/Makefile.am
+--- zhcon-0.2.5.orig/src/Makefile.am	2006-05-03 02:12:41.000000000 +0900
++++ zhcon-0.2.5/src/Makefile.am	2011-01-25 18:11:42.446555911 +0900
+@@ -7,15 +7,12 @@
+ 
+ SUBDIRS = display
+ 
+-install-exec-local:
+-	chmod 4755 $(bindir)/zhcon
+-
+ install-data-local:
+-	$(mkinstalldirs) $(prefix)/etc
+-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf
+ 
+ uninstall-local:
+-	-rm -f $(prefix)/etc/zhcon.conf
++	-rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf
+ 
+ # set the include path found by configure
+ INCLUDES= $(all_includes)
+diff -Naur zhcon-0.2.5.orig/tools/Makefile.am zhcon-0.2.5/tools/Makefile.am
+--- zhcon-0.2.5.orig/tools/Makefile.am	2006-04-25 01:38:46.000000000 +0900
++++ zhcon-0.2.5/tools/Makefile.am	2011-01-25 18:04:22.701226453 +0900
+@@ -9,11 +9,6 @@
+ #getbpsf_LDADD = -L/usr/X11R6/lib -lX11
+ #getbpsf_CPPFLAGS = -I/usr/X11R6/include
+ 
+-LDFLAGS=
+-CXXFLAGS=
+-CCFLAGS=
+-LIBS=
+-
+ EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\
+              gpm-1.19.6-patched.tar.gz
+ 
diff --git a/app-i18n/zhcon/zhcon-0.2.6-r2.ebuild b/app-i18n/zhcon/zhcon-0.2.6-r2.ebuild
new file mode 100644
index 000000000000..98d543e51a9d
--- /dev/null
+++ b/app-i18n/zhcon/zhcon-0.2.6-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/zhcon-0.2.6-r2.ebuild,v 1.1 2011/01/25 14:25:17 matsuu Exp $
+
+WANT_AUTOMAKE="1.9"
+EAPI="3"
+
+inherit autotools eutils
+
+MY_P="${P/6/5}"
+
+DESCRIPTION="A Fast CJK (Chinese/Japanese/Korean) Console Environment"
+HOMEPAGE="http://zhcon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zhcon/${MY_P}.tar.gz
+		mirror://sourceforge/zhcon/zhcon-0.2.5-to-0.2.6.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ggi gpm"
+
+DEPEND="ggi? ( media-libs/libggi[X] )
+	gpm? ( sys-libs/gpm )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+	epatch "${FILESDIR}"/${P}.sysconfdir.patch
+	epatch "${FILESDIR}"/${P}.configure.in.patch
+	epatch "${FILESDIR}"/${P}+gcc-4.3.patch
+	epatch "${FILESDIR}"/${P}+linux-headers-2.6.26.patch
+	epatch "${FILESDIR}"/${P}-curses.patch
+	epatch "${FILESDIR}"/${P}-amd64.patch
+	epatch "${FILESDIR}"/${P}-automagic-fix.patch
+	epatch "${FILESDIR}"/${P}.make-fix.patch
+	for f in $(grep -lir HAVE_GGI_LIB *); do
+		sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" "${f}" || die "sed failed"
+	done
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with ggi) \
+		$(use_with gpm) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog README NEWS TODO THANKS || die
+	dodoc README.BSD README.gpm README.utf8 || die
+}