fix build problem

6 files changed, 77 insertions, 76 deletions

diff --git a/gnome-extra/medusa/ChangeLog b/gnome-extra/medusa/ChangeLog
index 816b0aa3fea3..7933e61b3903 100644
--- a/gnome-extra/medusa/ChangeLog
+++ b/gnome-extra/medusa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/medusa
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/medusa/ChangeLog,v 1.2 2002/03/10 09:17:11 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/medusa/ChangeLog,v 1.3 2002/03/17 21:36:11 azarah Exp $
+
+*medusa-0.5.1-r4 (15 Mar 2002)
+
+  15 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Fix compile error for libtool-1.4.2.
 
 *medusa-0.5.1-r3 (10 Mar 2002)
 
diff --git a/gnome-extra/medusa/files/digest-medusa-0.5.1-r2 b/gnome-extra/medusa/files/digest-medusa-0.5.1-r2
deleted file mode 100644
index 1934be951799..000000000000
--- a/gnome-extra/medusa/files/digest-medusa-0.5.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26da7d668110d2a053a53ff23f15d0d0 medusa-0.5.1.tar.gz 384482
diff --git a/gnome-extra/medusa/files/digest-medusa-0.5.1-r1 b/gnome-extra/medusa/files/digest-medusa-0.5.1-r4
index 1934be951799..1934be951799 100644
--- a/gnome-extra/medusa/files/digest-medusa-0.5.1-r1
+++ b/gnome-extra/medusa/files/digest-medusa-0.5.1-r4
diff --git a/gnome-extra/medusa/medusa-0.5.1-r1.ebuild b/gnome-extra/medusa/medusa-0.5.1-r1.ebuild
deleted file mode 100644
index 0b10a2bf91cd..000000000000
--- a/gnome-extra/medusa/medusa-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/medusa/medusa-0.5.1-r1.ebuild,v 1.2 2001/10/08 22:01:21 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="medusa"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-vfs-1.0.2-r1"
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --mandir=/usr/share/man				\
-		    --infodir=/usr/share/info				\
-		    --sharedstatedir=/var/lib 				\
-		    --localstatedir=/var/lib 				\
-		    --enable-prefer-db1 || die
-
-	# uid_t and gid_t is not #defined, fix
-	mv libmedusa/medusa-file-info-utilities.h libmedusa/medusa-file-info-utilities.h.orig
-	sed -e 's/uid_t/__uid_t/' -e 's/gid_t/__gid_t/' libmedusa/medusa-file-info-utilities.h.orig >libmedusa/medusa-file-info-utilities.h
-
-	emake medusainitdir=/tmp || die
-}
-
-src_install() {
-	make DESTDIR=${D} medusainitdir=/tmp install || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
-}
diff --git a/gnome-extra/medusa/medusa-0.5.1-r2.ebuild b/gnome-extra/medusa/medusa-0.5.1-r2.ebuild
deleted file mode 100644
index 7802b941ce8a..000000000000
--- a/gnome-extra/medusa/medusa-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/medusa/medusa-0.5.1-r2.ebuild,v 1.1 2002/01/17 20:54:30 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="medusa"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-vfs-1.0.2-r1"
-
-src_compile() {
-	CFLAGS="${CFLAGS} -I/usr/include/gnome-1.0"
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --mandir=/usr/share/man				\
-		    --infodir=/usr/share/info				\
-		    --sharedstatedir=/var/lib 				\
-		    --localstatedir=/var/lib 				\
-		    --enable-prefer-db1 || die
-
-	# uid_t and gid_t is not #defined, fix
-	mv libmedusa/medusa-file-info-utilities.h \
-		libmedusa/medusa-file-info-utilities.h.orig
-	sed -e 's/uid_t/__uid_t/' \
-		-e 's/gid_t/__gid_t/' \
-		libmedusa/medusa-file-info-utilities.h.orig \
-		> libmedusa/medusa-file-info-utilities.h
-
-	emake medusainitdir=/tmp || die
-}
-
-src_install() {
-	make DESTDIR=${D} medusainitdir=/tmp install || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
-}
diff --git a/gnome-extra/medusa/medusa-0.5.1-r4.ebuild b/gnome-extra/medusa/medusa-0.5.1-r4.ebuild
new file mode 100644
index 000000000000..2908ea9ce4ab
--- /dev/null
+++ b/gnome-extra/medusa/medusa-0.5.1-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/medusa/medusa-0.5.1-r4.ebuild,v 1.1 2002/03/17 21:36:12 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Medusa search system for GNOME"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.gnome.org/"
+
+DEPEND=">=gnome-base/gnome-vfs-1.0.2-r1
+	nls? ( >=dev-util/intltool-0.11 sys-devel/gettext )
+	dev-libs/libxml
+	gnome-base/gnome-libs
+	>=sys-devel/libtool-1.4.2-r1"
+
+src_unpack() {
+	
+	unpack ${A}
+
+	#fix buggy Makefile for use with later versions of libtool
+	cd ${S}/gnome-vfs-module
+	cp Makefile.in Makefile.in.orig
+	sed -e 's:-L$(top_builddir)/libmedusa/.libs:-L$(top_builddir)/libmedusa:' \
+		Makefile.in.orig >Makefile.in
+	cd ${S}
+
+	#update libtool to fix "relink" bug
+	libtoolize --copy --force &>/dev/null
+	aclocal
+}
+
+src_compile() {
+
+	local myconf
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	CFLAGS="${CFLAGS} -I/usr/include/gnome-1.0"
+
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--sharedstatedir=/var/lib \
+		--localstatedir=/var/lib \
+		--enable-prefer-db1 \
+		${myconf} || die
+
+	# uid_t and gid_t is not #defined, fix
+	mv libmedusa/medusa-file-info-utilities.h \
+		libmedusa/medusa-file-info-utilities.h.orig
+	sed -e 's/uid_t/__uid_t/' \
+		-e 's/gid_t/__gid_t/' \
+		libmedusa/medusa-file-info-utilities.h.orig \
+		> libmedusa/medusa-file-info-utilities.h
+
+	emake medusainitdir=/tmp -k check || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} \
+		medusainitdir=/tmp \
+		install || die
+
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
+}
+