Fixed compile error with xorg-x11. This closes bug #154196. Also fixed modular X dependency.

Package-Manager: portage-2.1.1

6 files changed, 97 insertions, 11 deletions

diff --git a/app-i18n/minichinput/ChangeLog b/app-i18n/minichinput/ChangeLog
index e8d323a55fb8..6479b8103b94 100644
--- a/app-i18n/minichinput/ChangeLog
+++ b/app-i18n/minichinput/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/minichinput
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/ChangeLog,v 1.3 2005/01/01 14:35:58 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/ChangeLog,v 1.4 2006/11/05 17:37:56 usata Exp $
+
+  05 Nov 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +files/minichinput-0.1.9-gcc4.patch,
+  +files/minichinput-0.1.9-xorg-x11.patch, minichinput-0.1.9.ebuild:
+  Fixed compile error with xorg-x11. This closes bug #154196.
+  Also fixed modular X dependency.
 
 *minichinput-0.1.9 (31 Aug 2003)
 
diff --git a/app-i18n/minichinput/Manifest b/app-i18n/minichinput/Manifest
index 34544afda2ea..3db5cb06f7f5 100644
--- a/app-i18n/minichinput/Manifest
+++ b/app-i18n/minichinput/Manifest
@@ -1,4 +1,29 @@
-MD5 abc1d22391310d399243e74171b1fbbd ChangeLog 414
+AUX minichinput-0.1.9-gcc4.patch 453 RMD160 efa04e012af691d3fa2a4605b1c17baca1f994bc SHA1 1287857a92b565891ebbea08788ddc3e8e013b51 SHA256 b1c96a69b8d3a240e709c021d5ecbe1e8e0ef8d6e4433bea2ebbcb77e8bb8bc9
+MD5 c6a3b7a861a6fb51fd19da3135400ab7 files/minichinput-0.1.9-gcc4.patch 453
+RMD160 efa04e012af691d3fa2a4605b1c17baca1f994bc files/minichinput-0.1.9-gcc4.patch 453
+SHA256 b1c96a69b8d3a240e709c021d5ecbe1e8e0ef8d6e4433bea2ebbcb77e8bb8bc9 files/minichinput-0.1.9-gcc4.patch 453
+AUX minichinput-0.1.9-gcc4.patch.bak 417 RMD160 6b344ec2554f35a5e2fcd8591ff5ee9e85719a1c SHA1 5398d0affef81c1aeb8c65c6185559cfdcd9c2f7 SHA256 539bde68c154f3e096772806ec32c08954627dfc36a29524f88732cc2c06fa72
+MD5 33462bfd7129e8fb0e0c4f7769ee3948 files/minichinput-0.1.9-gcc4.patch.bak 417
+RMD160 6b344ec2554f35a5e2fcd8591ff5ee9e85719a1c files/minichinput-0.1.9-gcc4.patch.bak 417
+SHA256 539bde68c154f3e096772806ec32c08954627dfc36a29524f88732cc2c06fa72 files/minichinput-0.1.9-gcc4.patch.bak 417
+AUX minichinput-0.1.9-xorg-x11.patch 1657 RMD160 cd4a617d857816048be0f72f118d1ba1f2352440 SHA1 fc11a605423313071ddd2a09eff1ec88953a73ec SHA256 0ee2782bc549d361756c1ab7206796eaa488f18e93a9d091149aeccf7df1e185
+MD5 e5bafedb4b76059bae304e612b03cdde files/minichinput-0.1.9-xorg-x11.patch 1657
+RMD160 cd4a617d857816048be0f72f118d1ba1f2352440 files/minichinput-0.1.9-xorg-x11.patch 1657
+SHA256 0ee2782bc549d361756c1ab7206796eaa488f18e93a9d091149aeccf7df1e185 files/minichinput-0.1.9-xorg-x11.patch 1657
+DIST miniChinput-0.1.9-rxvt.patch 8606 RMD160 2f3ec3de6f7bd80ae6e8aa1e27f502ce1ee9d4ca SHA1 f09650aa131b6f2f0093bc849f74292ddf0db5c9 SHA256 aee83af616c76424346e987d28ffbef8b7b74525d55d206bf00747688d3e0436
+DIST miniChinput-0.1.9.tar.gz 1631895 RMD160 cca0801fe5ea8c907c09e4e69ce26d0e0501ed00 SHA1 42bad9a8cf8e9c416d11318d1522856fcbb5efe8 SHA256 ca82e264d979d4a66056208b4b09e0246856e126018ecc8bb6716e0e4b1b7b5c
+EBUILD minichinput-0.1.9.ebuild 1403 RMD160 0ddfd5176fba8eceaa63a24e4ef60695cde216b4 SHA1 f8b23d1e639aaf166470fd8b65b1294c52819a2f SHA256 8617f714241e728a5210810d34ff0293cfbab4f91ec1305973d96b7dd75f7c3c
+MD5 a0c3d9001898ba5f65f8a07e5807bfca minichinput-0.1.9.ebuild 1403
+RMD160 0ddfd5176fba8eceaa63a24e4ef60695cde216b4 minichinput-0.1.9.ebuild 1403
+SHA256 8617f714241e728a5210810d34ff0293cfbab4f91ec1305973d96b7dd75f7c3c minichinput-0.1.9.ebuild 1403
+MISC ChangeLog 664 RMD160 d971cf2bd61dc507ab868516de53b0db5cd56415 SHA1 8050e17312c314a9c911a9ee6ceda0c29939a125 SHA256 834af550872ae65a010a68c00ffcacbc7d510e9eb56fb1cd61928d800b4f3d7e
+MD5 4c6fec135ae5d50a13f591b9d9a574a9 ChangeLog 664
+RMD160 d971cf2bd61dc507ab868516de53b0db5cd56415 ChangeLog 664
+SHA256 834af550872ae65a010a68c00ffcacbc7d510e9eb56fb1cd61928d800b4f3d7e ChangeLog 664
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 452e7f1908052e41a3b6dbe56cf63963 minichinput-0.1.9.ebuild 1162
-MD5 f74fb4e74f541bb20b5f6497d24396ae files/digest-minichinput-0.1.9 141
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+MD5 0d586cf20a9f7aeeb9a7906b43a6fe32 files/digest-minichinput-0.1.9 515
+RMD160 b1985ee81f0b11c8dc3d11cb6b2efc55d6f8dc4b files/digest-minichinput-0.1.9 515
+SHA256 b8e87a00dd299a404ca3ae9eed62a69b64a994a9ab8dbde0d07c04698a583767 files/digest-minichinput-0.1.9 515
diff --git a/app-i18n/minichinput/files/digest-minichinput-0.1.9 b/app-i18n/minichinput/files/digest-minichinput-0.1.9
index 550e187f7728..6daef9c53279 100644
--- a/app-i18n/minichinput/files/digest-minichinput-0.1.9
+++ b/app-i18n/minichinput/files/digest-minichinput-0.1.9
@@ -1,2 +1,6 @@
-MD5 7c767a0ae9cfcd1c1f6bad3931386175 miniChinput-0.1.9.tar.gz 1631895
 MD5 75335d1556d37e4b943a511b6676b07c miniChinput-0.1.9-rxvt.patch 8606
+RMD160 2f3ec3de6f7bd80ae6e8aa1e27f502ce1ee9d4ca miniChinput-0.1.9-rxvt.patch 8606
+SHA256 aee83af616c76424346e987d28ffbef8b7b74525d55d206bf00747688d3e0436 miniChinput-0.1.9-rxvt.patch 8606
+MD5 7c767a0ae9cfcd1c1f6bad3931386175 miniChinput-0.1.9.tar.gz 1631895
+RMD160 cca0801fe5ea8c907c09e4e69ce26d0e0501ed00 miniChinput-0.1.9.tar.gz 1631895
+SHA256 ca82e264d979d4a66056208b4b09e0246856e126018ecc8bb6716e0e4b1b7b5c miniChinput-0.1.9.tar.gz 1631895
diff --git a/app-i18n/minichinput/files/minichinput-0.1.9-gcc4.patch b/app-i18n/minichinput/files/minichinput-0.1.9-gcc4.patch
new file mode 100644
index 000000000000..2472ecbd8075
--- /dev/null
+++ b/app-i18n/minichinput/files/minichinput-0.1.9-gcc4.patch
@@ -0,0 +1,11 @@
+--- miniChinput-0.1.9/src/keyboard.c.orig	2003-07-14 14:09:41.000000000 +0900
++++ miniChinput-0.1.9/src/keyboard.c	2006-11-06 02:22:10.000000000 +0900
+@@ -24,7 +24,7 @@
+ #define INC (x0 += KEY_WIDTH)
+ #define HALFINC (x0 += KEY_WIDTH/2)
+ 
+-extern int ForwardEvent();
++extern int ForwardEvent(unsigned long, Boolean, Boolean, Boolean);
+ static void set_key(int n, unsigned long keysym, int x, int y, int w, int h);
+ static int in_keys(int x0, int y0);
+ 
diff --git a/app-i18n/minichinput/files/minichinput-0.1.9-xorg-x11.patch b/app-i18n/minichinput/files/minichinput-0.1.9-xorg-x11.patch
new file mode 100644
index 000000000000..b83ac739765b
--- /dev/null
+++ b/app-i18n/minichinput/files/minichinput-0.1.9-xorg-x11.patch
@@ -0,0 +1,34 @@
+diff -urN miniChinput-0.1.9.orig/configure miniChinput-0.1.9/configure
+--- miniChinput-0.1.9.orig/configure	2003-07-14 14:09:41.000000000 +0900
++++ miniChinput-0.1.9/configure	2006-11-06 02:11:37.000000000 +0900
+@@ -3413,11 +3413,11 @@
+ 
+ # Check Xft related headers and libs.
+ 
+-tmpar=`find /usr/include /usr/X11R6/include -name Xft.h | sed 's?/X11/Xft/Xft.h??'`
++tmpar=`find /usr/include -name Xft.h | sed 's?/X11/Xft/Xft.h??'`
+ TMP_XFT2=`echo "$tmpar"|grep Xft2`
+ TMP_XFT=`echo "$tmpar"|grep -v Xft2`
+ 
+-tmpar=`find /usr/include /usr/X11R6/include -name freetype.h | sed 's?/freetype/freetype.h??'`
++tmpar=`find /usr/include -name freetype.h | sed 's?/freetype/freetype.h??'`
+ TMP_FREE2=`echo "$tmpar"|grep freetype2`
+ TMP_FREE=`echo "$tmpar"|grep -v freetype2`
+ if test "x$TMP_XFT2" != "x" -a "x$TMP_FREE2" != "x"; then
+diff -urN miniChinput-0.1.9.orig/configure.in miniChinput-0.1.9/configure.in
+--- miniChinput-0.1.9.orig/configure.in	2003-07-14 14:09:41.000000000 +0900
++++ miniChinput-0.1.9/configure.in	2006-11-06 02:11:54.000000000 +0900
+@@ -45,11 +45,11 @@
+ 
+ # Check Xft related headers and libs.
+ 
+-tmpar=`find /usr/include /usr/X11R6/include -name Xft.h | sed 's?/X11/Xft/Xft.h??'`
++tmpar=`find /usr/include -name Xft.h | sed 's?/X11/Xft/Xft.h??'`
+ TMP_XFT2=`echo "$tmpar"|grep Xft2`
+ TMP_XFT=`echo "$tmpar"|grep -v Xft2`
+ 
+-tmpar=`find /usr/include /usr/X11R6/include -name freetype.h | sed 's?/freetype/freetype.h??'`
++tmpar=`find /usr/include -name freetype.h | sed 's?/freetype/freetype.h??'`
+ TMP_FREE2=`echo "$tmpar"|grep freetype2`
+ TMP_FREE=`echo "$tmpar"|grep -v freetype2`
+ if test "x$TMP_XFT2" != "x" -a "x$TMP_FREE2" != "x"; then 
diff --git a/app-i18n/minichinput/minichinput-0.1.9.ebuild b/app-i18n/minichinput/minichinput-0.1.9.ebuild
index a69363a040c2..c4f94293e252 100644
--- a/app-i18n/minichinput/minichinput-0.1.9.ebuild
+++ b/app-i18n/minichinput/minichinput-0.1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/minichinput-0.1.9.ebuild,v 1.6 2005/01/01 14:35:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/minichinput-0.1.9.ebuild,v 1.7 2006/11/05 17:37:56 usata Exp $
 
 inherit eutils
 
@@ -16,21 +16,27 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	virtual/xft
+DEPEND="|| ( x11-libs/libX11 virtual/x11 )
+	|| ( x11-libs/libXft virtual/xft )
 	media-libs/fontconfig
 	>=media-libs/imlib-1.9.13
 	!app-i18n/chinput"
+RDEPEND="${DEPEND}
+	|| ( media-fonts/font-sony-misc virtual/x11 )"
 
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	epatch ${DISTDIR}/${MY_P}-rxvt.patch
+	epatch ${FILESDIR}/${P}-xorg-x11.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
 
 src_compile() {
-	econf || die "configure failed"
+	econf \
+		--x-includes=/usr/include \
+		--x-libraries=/usr/lib || die "configure failed"
 	emake || die "make failed"
 	emake data || die "make data failed"
 }