Fixed dependency, bug #303001. Clean up.

Package-Manager: portage-2.1.9.31/cvs/Linux x86_64

5 files changed, 199 insertions, 7 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/Manifest b/app-i18n/zhcon/Manifest
index fb36a1129e45..d3925302a3ee 100644
--- a/app-i18n/zhcon/Manifest
+++ b/app-i18n/zhcon/Manifest
@@ -5,19 +5,32 @@ AUX zhcon-0.2.5.make-fix.patch 2618 RMD160 5d8187c897778a59396f58153545b75e29143
 AUX zhcon-0.2.6+gcc-4.3.patch 5808 RMD160 486be46a85c08ac9b000bfd318b5a5a741dad655 SHA1 a023af19544257790f04470b85a1d0a42f126e70 SHA256 376503635df1d7d420d3979535db8b41ceeaf3c53643d2cf5ca0582bb5ebc068
 AUX zhcon-0.2.6+linux-headers-2.6.26.patch 527 RMD160 f05e417df9330f6d9233096f0f800e99fa871606 SHA1 f6a10c6d8075e90cb4be6a82fb14a46fb1143ff2 SHA256 4ac96b499010b099789fc2fb44715e4c30b170b37ca70512512fb2f02a085473
 AUX zhcon-0.2.6-amd64.patch 2760 RMD160 140a39cd02f9ccd107b4f727d4aacdc32fa93ea0 SHA1 adfb57f4aa24cc9f7f2f6e88e0dc93f5f80c2349 SHA256 86af4cd283c5b83fbb427248d79dd5a13e379870b735c678bb041736750ff103
+AUX zhcon-0.2.6-automagic-fix.patch 1363 RMD160 420baea41c8dadb3638fde980981238f11e0dbbc SHA1 01be2eca5190455bf2da65d807c287129bad40e2 SHA256 977d728c7d1bc2953dc39ac3699791f63f6a10df60eeab5d338cce36d20fc71c
 AUX zhcon-0.2.6-curses.patch 694 RMD160 41255902689919399659903f238300a87e22054e SHA1 6cf0ce421f38fdd929af179e8045e36156612b89 SHA256 7f64f8bba73ae1a5d8bc177ad8c2afec2c4993b618625b12f0e6ef89f381555b
 AUX zhcon-0.2.6.configure.in.patch 379 RMD160 a389020b174d856b7a9ba7e5f8e4d33bfca53df7 SHA1 61fe01cb5c0560300e69f86d9a87b011f3612644 SHA256 b60776306429db1afdda49e500bf1aa20c654c5b183e7e599afe08a0bc582dda
+AUX zhcon-0.2.6.make-fix.patch 3071 RMD160 d76de31187f9dde13120bbeee74d63c9f8a0b235 SHA1 ec946057a814c5d845f3403f3a0aa3fa7f6e5439 SHA256 90d62243a7bd482cdbdd627f559c93c5d4c5e931426f8225f75cda484d2571a1
 AUX zhcon-0.2.6.sysconfdir.patch 874 RMD160 624ce7a9fd644e96a0a5efc5ec7446606fa673f6 SHA1 2744ae18a7eb52a0471228cedc1d51a3de4c152e SHA256 9d0ce6c403f808c9a0d942297b72723765155fceb2dc5345ea1e3d7e26510efc
 DIST zhcon-0.2.5-to-0.2.6.diff.gz 2881 RMD160 b461e19f79c7a904d79f889106418eefee433d1c SHA1 524e82d1bf362101df777d31d81f2b9c035d5881 SHA256 c9da3f7290f7d74f3ca4f0d78c00c73c0100bcca5eba5d08c629ddc6c7ced9e1
 DIST zhcon-0.2.5.tar.gz 5011644 RMD160 d72650f5f08eaedca55006c4cd96e45b1890abc4 SHA1 5e76471e75e8eefa72b29fcc05042d9539140f69 SHA256 4ce4dc1395b6f6a920d44aac069a284bff76df4019ac4164850d263538465d59
 EBUILD zhcon-0.2.6-r1.ebuild 1154 RMD160 c5ca1ce897873d0b0e957b6bc6121e18886adedf SHA1 9bbe11fe3e995011c2ea970b9ec740515a76440c SHA256 fd5d1f9bb83cc1eac6d323ad96ec5bde521146b39129971f1e93a07c3f3f4579
+EBUILD zhcon-0.2.6-r2.ebuild 1469 RMD160 c60d7d38949b1f8ca378cb01352f68c9959b01c7 SHA1 1de801ba7410ec756023a496a7ec6c7f9f442c35 SHA256 a2c117f2b5abdf00354d0c624fa63aecf4842190d56bd298746faa7e4238ef87
 EBUILD zhcon-0.2.6.ebuild 1011 RMD160 179bdd334941f4ef48b2a796dabcb683773a16de SHA1 fb32f9951082e301ff1a9d6fbdd62aa030936578 SHA256 4347eb41911a7131bbaed0d761c6bd48e53decd39deb4e761b06d379764a4d21
-MISC ChangeLog 2757 RMD160 4a8cbfec7eb7b7d4b6a201dc0c8963033ea1a45a SHA1 44d539524b794f0418fd50b2e8c7c141f88f434f SHA256 7ffc2be3230cef813523931404bbafbe1a2d3188b9058eaf8d6444513920cb4f
+MISC ChangeLog 3028 RMD160 d49e88a3dc1ead0994a4a1dd2e51b6096ef4b084 SHA1 02e436e091e2c49d0ea5ea83f55eb9ee2f571dff SHA256 265f7097b20b64724cb9ddc5d9482b6303dc10cb899bd4d20f96513dd89b0b15
 MISC metadata.xml 684 RMD160 0c7fbd17ab149dde059fdc592a7db5031209fa5a SHA1 9f4ccf83fc1f7615dee1c2f5ddfead1d4f2cd37a SHA256 e73d08f833573b1d4b3b2ec4eaac0a4989b0bfc1cf051822a0d860671693f2c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkw23/UACgkQV3J2n04EauwDawCfVgND/b9uHejeVJm1UGSk7I8J
-L7oAn3SO9FlCGMprqCmT7wZrVCctfz64
-=UNYT
+iQIcBAEBAgAGBQJNPt1TAAoJECaGw+YFKA1pJhAP/RcRmcfV8kQQetHMQIONO4fC
+ZiMZ9f2Idp8u+Qq9Em9xeQiDf74io9W2//kTbsEHZrItamPVs3ibq6+JuEEyEwgn
+04UYi3+R2qiGORO7jm92tlUHKA3B2R0kijeY0E6Vb9fNcb9eU4efejlBOZc4ObrB
+lv2kBa0SByyzLJG3yuaWYsCAevv05q6r22g900fbqiqqZqe8RL7WQreC+e2siyvS
+ReBl5VeluY4da1aI4iz1KmSIHMxTIQphAcjDo3GS97qsglHu0WrAbKo17oSU6foB
+Hh2YFkHbgSFyDVDFlweft/kqBp6gOGYOX/kgV2PSRR93+GrQI82Kl2P+GvDPk//d
+B72Hubr8LaeSoMytvPiSrtGe8nyaJ2pOhVQFvMPagsRRiNtDST4dmS7uaRx1cafY
+egPg29thfvgMh4kSiJicjkAkZS/cY5+LL7fGRXSvxtD8qz7x9mvuI3vfNHSC/fzw
+BuwQAPNQPENoIjLjw1rX65s2jWeY1Hpi5g3v/araK3DiqdZN/z9qeQQSMdHHh/hi
+SZgX8dN8htvuk6FzJp9k34u3UODS1k0qD6dNnsFzOWkD27bNMTpOUgONxafN+FS3
+9zoqz9eOqKmN9L8ES0ywBd529TvIhx6sMqmmRHdH19yzoFFvxIlDR+DTj6ugA/T/
+XQdb1PYqISOQrHzuA35y
+=gird
 -----END PGP SIGNATURE-----
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
+}