Fixed compile bug when >=dev-libs/eb-4

5 files changed, 50 insertions, 18 deletions

diff --git a/app-dicts/ebview/ChangeLog b/app-dicts/ebview/ChangeLog
index 00eca9d6cdec..b7208b74aeb4 100644
--- a/app-dicts/ebview/ChangeLog
+++ b/app-dicts/ebview/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for app-dicts/ebview
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ChangeLog,v 1.6 2004/01/01 20:19:16 usata Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ChangeLog,v 1.7 2004/01/03 17:04:18 usata Exp $
 
   02 Jan 2004; <usata@gentoo.org> ebview-0.3.1.ebuild, ebview-0.3.2.ebuild:
-  Fixed finding eb library bug
+  Fixed compile bug when >=dev-libs/eb-4
 
 *ebview-0.3.2 (01 Jan 2004)
 
diff --git a/app-dicts/ebview/Manifest b/app-dicts/ebview/Manifest
index 69c4625d344e..aaa8cc8cf257 100644
--- a/app-dicts/ebview/Manifest
+++ b/app-dicts/ebview/Manifest
@@ -1,7 +1,8 @@
-MD5 f1a70330aaed8dc851b72f1f625b6d62 ebview-0.3.1.ebuild 903
-MD5 3f35660a636d45cdcc12540c430bffc2 ChangeLog 1020
+MD5 fcbe470267195a7a9c709682bec951fb ebview-0.3.1.ebuild 947
+MD5 265f8403562a472f42e85c6c80769d59 ChangeLog 1030
 MD5 d1411e42201207c6fd5ce3c1e9c37483 metadata.xml 251
-MD5 453aac2a1fd8170b3dbba44f530ad0e3 ebview-0.3.2.ebuild 904
+MD5 ee534a60981faf7d5713f518502ecf3f ebview-0.3.2.ebuild 948
 MD5 d875e51767ea447936891b25d7ce395c files/digest-ebview-0.3.1 64
 MD5 496f3a478b1a1766fb374c5f2cb77f28 files/digest-ebview-0.3.2 64
 MD5 669a87056e662de95352ff0a7386f940 files/ebview-gettext-0.12-gentoo.diff 371
+MD5 9c7f1c53b02aa9a25fd49428d42db72d files/ebview-eb4-gentoo.diff 727
diff --git a/app-dicts/ebview/ebview-0.3.1.ebuild b/app-dicts/ebview/ebview-0.3.1.ebuild
index bfe84a7366e2..42f617763606 100644
--- a/app-dicts/ebview/ebview-0.3.1.ebuild
+++ b/app-dicts/ebview/ebview-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.1.ebuild,v 1.5 2004/01/01 20:19:16 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.1.ebuild,v 1.6 2004/01/03 17:04:18 usata Exp $
 
 IUSE=""
 
@@ -12,17 +12,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND=">=dev-libs/eb-3.3.4
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57"
+RDEPEND=">=dev-libs/eb-3.3.4
 	>=x11-libs/gtk+-2.2
 	sys-devel/gettext"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 
 	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-eb4-gentoo.diff
 
-	if use nls && has_version '>=sys-devel/gettext-0.12' ; then
+	if has_version '>=sys-devel/gettext-0.12' ; then
 		cd ${S}/po
 		epatch ${FILESDIR}/${PN}-gettext-0.12-gentoo.diff
 	fi
@@ -30,7 +32,7 @@ src_unpack() {
 
 src_compile() {
 
-	export CPPFLAGS="${CPPFLAGS} -DPROTOTYPES"
+	autoreconf || die
 
 	econf --with-eb-conf=/etc/eb.conf || die
 	emake || die
diff --git a/app-dicts/ebview/ebview-0.3.2.ebuild b/app-dicts/ebview/ebview-0.3.2.ebuild
index 882c4a976568..e3ac06161915 100644
--- a/app-dicts/ebview/ebview-0.3.2.ebuild
+++ b/app-dicts/ebview/ebview-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.2.ebuild,v 1.2 2004/01/01 20:19:16 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.2.ebuild,v 1.3 2004/01/03 17:04:18 usata Exp $
 
 IUSE=""
 
@@ -12,17 +12,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
-DEPEND=">=dev-libs/eb-3.3.4
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57"
+RDEPEND=">=dev-libs/eb-3.3.4
 	>=x11-libs/gtk+-2.2
 	sys-devel/gettext"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 
 	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-eb4-gentoo.diff
 
-	if use nls && has_version '>=sys-devel/gettext-0.12' ; then
+	if has_version '>=sys-devel/gettext-0.12' ; then
 		cd ${S}/po
 		epatch ${FILESDIR}/${PN}-gettext-0.12-gentoo.diff
 	fi
@@ -30,7 +32,7 @@ src_unpack() {
 
 src_compile() {
 
-	export CPPFLAGS="${CPPFLAGS} -DPROTOTYPES"
+	autoreconf || die
 
 	econf --with-eb-conf=/etc/eb.conf || die
 	emake || die
diff --git a/app-dicts/ebview/files/ebview-eb4-gentoo.diff b/app-dicts/ebview/files/ebview-eb4-gentoo.diff
new file mode 100644
index 000000000000..6d766463f7cf
--- /dev/null
+++ b/app-dicts/ebview/files/ebview-eb4-gentoo.diff
@@ -0,0 +1,27 @@
+diff -urN ebview-0.3.2.ORIG/configure.in ebview-0.3.2/configure.in
+--- ebview-0.3.2.ORIG/configure.in	2003-12-26 20:52:09.000000000 +0900
++++ ebview-0.3.2/configure.in	2004-01-04 01:43:06.219379952 +0900
+@@ -21,8 +21,6 @@
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+             
+-eb_LIB_EB3
+-
+ dnl Checks for header files.
+ AC_PATH_X
+ AC_HEADER_STDC
+@@ -33,6 +31,7 @@
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_PROG_GCC_TRADITIONAL
+ AC_C_CONST
++AC_C_PROTOTYPES
+ AC_TYPE_PID_T
+ AC_HEADER_TIME
+ AC_TYPE_OFF_T
+@@ -57,5 +56,6 @@
+ AC_SUBST(RES_FILE)
+ AC_SUBST(EXTRA_LIBS)
+ 
++eb_LIB_EB3
+ 
+ AC_OUTPUT(po/Makefile.in src/Makefile Makefile m4/Makefile data/Makefile doc/Makefile data/about.jp data/about.en)