db3 and other cleanups

4 files changed, 35 insertions, 26 deletions

diff --git a/app-i18n/xcin/ChangeLog b/app-i18n/xcin/ChangeLog
index db558fec17b0..1e23d9502d1d 100644
--- a/app-i18n/xcin/ChangeLog
+++ b/app-i18n/xcin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/xcin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/ChangeLog,v 1.5 2003/05/23 22:03:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/ChangeLog,v 1.6 2003/11/04 00:27:11 liquidx Exp $
+
+  04 Nov 2003; Alastair Tse <liquidx@gentoo.org> xcin-2.5.3_pre2.ebuild,
+  files/xcin-2.5.3_pre2-db3.patch:
+  added db-3 patch from Palatis <palatis@gentoo.org.tw> (#32655)
 
   23 May 2003; Alastair Tse <liquidx@gentoo.org> files/gentoo-xcinrc:
   fix wrong xcin path in xcinrc
diff --git a/app-i18n/xcin/Manifest b/app-i18n/xcin/Manifest
index e09f69f5a2b1..2fc3b5c2705c 100644
--- a/app-i18n/xcin/Manifest
+++ b/app-i18n/xcin/Manifest
@@ -1,9 +1,10 @@
-MD5 529c1cee087badbcf33847228e8cc211 ChangeLog 853
-MD5 fe6c952e02e106c2af05d3b92f24e1b9 xcin-2.5.2.3.ebuild 1017
-MD5 131afb501f58b47a2b7b9b49504cd5ac xcin-2.5.3_pre2.ebuild 1688
+MD5 a4f2727c6c461fb53e9f81608cc83fec ChangeLog 1027
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 fe6c952e02e106c2af05d3b92f24e1b9 xcin-2.5.2.3.ebuild 1017
+MD5 f7c60770036cf5ce78cf15421ab88628 xcin-2.5.3_pre2.ebuild 1552
 MD5 698d94bfd746092fb8e1eda636dba660 files/digest-xcin-2.5.2.3 65
 MD5 5aced2b4a30907127ff8090d320e0f8e files/digest-xcin-2.5.3_pre2 147
 MD5 ef91a9aa450278758e82e712b3296141 files/gentoo-xcinrc 7927
+MD5 6e5bc36880a6b30cee3b3670725cb85b files/xcin-2.5.3_pre2-db3.patch 439
 MD5 31ddfe2e1c6e6354ab2dec0a41d28bdf files/xcin-gentoo.patch 1535
 MD5 3cff29c7fef9ace734719fe5434e43c1 files/xcin-2.5.3_pre2/gentoo-xcin.patch 468
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre2-db3.patch b/app-i18n/xcin/files/xcin-2.5.3_pre2-db3.patch
new file mode 100644
index 000000000000..416e737df281
--- /dev/null
+++ b/app-i18n/xcin/files/xcin-2.5.3_pre2-db3.patch
@@ -0,0 +1,13 @@
+diff -uNrbB xcin.bak/configure xcin/configure
+--- xcin.bak/configure  2003-09-21 01:20:50.000000000 +0800
++++ xcin/configure      2003-09-21 01:21:01.000000000 +0800
+@@ -7869,7 +7869,7 @@
+ fi
+ 
+ LIBS="$OLD_LIBS"
+-for f in db db3; do
++for f in db db3 db-3; do
+     echo $ac_n "checking for db_create in -l$f""... $ac_c" 1>&6
+ echo "configure:7875: checking for db_create in -l$f" >&5
+ ac_lib_var=`echo $f'_'db_create | sed 'y%./+-%__p_%'`
+
diff --git a/app-i18n/xcin/xcin-2.5.3_pre2.ebuild b/app-i18n/xcin/xcin-2.5.3_pre2.ebuild
index 5dcd9dc3dc5f..ecf89ff4e53d 100644
--- a/app-i18n/xcin/xcin-2.5.3_pre2.ebuild
+++ b/app-i18n/xcin/xcin-2.5.3_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/xcin-2.5.3_pre2.ebuild,v 1.5 2003/09/06 22:19:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/xcin-2.5.3_pre2.ebuild,v 1.6 2003/11/04 00:27:12 liquidx Exp $
 
 XCIN="${P/_/.}.tar.gz"
 CHEWING="chewing-2002Jan07-snapshot.tar.gz"
@@ -17,7 +17,9 @@ IUSE="nls"
 
 DEPEND="nls? ( sys-devel/gettext )
 	>=app-i18n/libtabe-0.2.5"
+
 S=${WORKDIR}/${PN}
+MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
 	unpack ${XCIN}
@@ -29,43 +31,32 @@ src_unpack() {
 
 	# gcc3.2 changed the way we deal with -I. So until the configure script
 	# is updated we need this hack as a work around.
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${PF}/gentoo-xcin.patch || die
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PF}/gentoo-xcin.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-db3.patch
 }
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
+	econf \
 		--with-xcin-rcdir=/etc \
 		--with-xcin-dir=/usr/lib/X11/xcin25 \
 		--with-db-lib=/usr/lib \
 		--with-tabe-inc=/usr/include/tabe \
 		--with-tabe-lib=/usr/lib  ||  die "./configure failed"
-	make || die
+	emake || die
 }
 
 src_install() {
 	make \
 		prefix=${D}/usr \
-		xcin_rcp=${D}/etc \
-		xcin_binp=${D}/usr/bin \
-		xcin_libp=${D}/usr/lib \
-		xcin_modp=${D}/usr/lib/X11/xcin25 \
-		mandir=${D}/usr/share/man \
+		program_prefix=${D} \
 		install || die
 	dodir /etc
 	insinto /etc
 	newins ${FILESDIR}/gentoo-xcinrc xcinrc
+	
 	dodoc doc/*
-	docinto En
-	dodoc doc/En/*
-	docinto En/internal
-	dodoc doc/En/internal/*
-	docinto history
-	dodoc doc/history/*
-	docinto internal
-	dodoc doc/internal/*
-	docinto modules
-	dodoc doc/modules/*
+	for docdir in doc/En doc/En/internal doc/history doc/internal doc/modules; do
+		docinto ${docdir#doc/}
+		dodoc ${docdir}/*
+	done
 }