endeavour update and cleanup

10 files changed, 137 insertions, 142 deletions

diff --git a/app-misc/endeavour/ChangeLog b/app-misc/endeavour/ChangeLog
index 2c5f8c235141..f9b296ea4b6a 100644
--- a/app-misc/endeavour/ChangeLog
+++ b/app-misc/endeavour/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/endeavour
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.10 2003/04/02 08:56:39 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.11 2003/10/01 09:49:53 hanno Exp $
+
+*endeavour-2.3.3 (01 Oct 2003)
+
+  01 Oct 2003; Hanno Boeck <hanno@gentoo.org> endeavour-2.3.3.ebuild,
+  files/endeavour_gcc33_fix:
+  Version bump and fix for gcc 3.3.1 added.
+  Big endian patch removed, will stay ~ppc for now, ppc people should look
+  if the patch is still needed.
 
 *endeavour-2.3.0 (02 Apr 2003)
 
diff --git a/app-misc/endeavour/Manifest b/app-misc/endeavour/Manifest
index f598b8e87df7..9b67078ca104 100644
--- a/app-misc/endeavour/Manifest
+++ b/app-misc/endeavour/Manifest
@@ -1,12 +1,9 @@
-MD5 3e94b3fe269c692abd1394201c2f7a2e files/digest-endeavour-2.1.14 137
-MD5 2a4f2c0cfe25080ae5f655174ecd5dc1 files/digest-endeavour-2.1.20 137
-MD5 2a4f2c0cfe25080ae5f655174ecd5dc1 files/digest-endeavour-2.1.20-r1 137
-MD5 89308284538d300ed1b13e65522286e1 files/digest-endeavour-2.1.21 137
-MD5 0d48c27ed5f288b4d840f5a582345d17 files/endeavour-2.1.20-bigendian.diff 888
-MD5 a284a73aa807b07952301caacc420679 files/digest-endeavour-2.3.0 136
-MD5 8188dd4b3d6f665feefb8d1f544e637e endeavour-2.1.14.ebuild 1521
+MD5 72b2cec289da53307574fcca4045862d ChangeLog 1928
 MD5 b42e126864cec1edb875cc6a27725559 endeavour-2.1.20-r1.ebuild 1699
-MD5 d91e38f44a7d9741ab2b79c72c159b5d endeavour-2.1.20.ebuild 1440
-MD5 fe82157392b83bc1c2d3a33d74a5019f endeavour-2.1.21.ebuild 1507
-MD5 d99dba46bd98ca48fdb41ba3eec4ee69 ChangeLog 1645
 MD5 1677d29edcef32a13b45a3fe405f1fd6 endeavour-2.3.0.ebuild 1506
+MD5 f1c9e1cc01ba8550e439b059e02a2239 endeavour-2.3.3.ebuild 1279
+MD5 2a4f2c0cfe25080ae5f655174ecd5dc1 files/digest-endeavour-2.1.20-r1 137
+MD5 a284a73aa807b07952301caacc420679 files/digest-endeavour-2.3.0 136
+MD5 0d48c27ed5f288b4d840f5a582345d17 files/endeavour-2.1.20-bigendian.diff 888
+MD5 bd2dd1dce9552ef7afda353ea293044e files/endeavour_gcc33_fix 4553
+MD5 a696e8d6526b5d1804e72df6822bbdae files/digest-endeavour-2.3.3 136
diff --git a/app-misc/endeavour/endeavour-2.1.14.ebuild b/app-misc/endeavour/endeavour-2.1.14.ebuild
deleted file mode 100644
index ca3849ef9952..000000000000
--- a/app-misc/endeavour/endeavour-2.1.14.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.1.14.ebuild,v 1.9 2003/03/01 01:06:30 vapier Exp $
-
-M="endeavour2-mimetypes"
-DESCRIPTION="powerful file and image browser"
-HOMEPAGE="http://wolfpack.twu.net/Endeavour2/"
-SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2
-	ftp://wolfpack.twu.net/users/wolfpack/${M}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.9.10
-	>=media-gfx/iv-0.1.9"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	unpack ${M}.tgz
-
-	#need to remove reference to ctypes.h from fio.cpp to make gcc-3.x compile the package
-	cd ${S}/endeavour2
-	mv fio.cpp fio.cpp-orig
-	sed -e "s:#include <ctype.h>://#include <ctype.h>:" fio.cpp-orig >fio.cpp
-}
-
-src_compile() {
-	./configure Linux --prefix=/usr || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dobin endeavour2/endeavour2
-	doman endeavour2/endeavour2.1
-	dodir /usr/share/icons
-	insinto /usr/share/icons
-	doins endeavour2/images/endeavour_48x48.xpm \
-	endeavour2/images/image_browser_48x48.xpm \
-	endeavour2/images/icon_trash_48x48.xpm \
-	endeavour2/images/icon_trash_empty_48x48.xpm
-	dodir /usr/share/endeavour2
-	cp -R endeavour2/data/* ${D}/usr/share/endeavour2
-	dodoc AUTHORS HACKING INSTALL README TODO
-
-	# install mimetypes
-	cd ${WORKDIR}/${M}
-	mv README README.mimetypes
-	dodoc README.mimetypes
-	insinto /usr/share/endeavour2/
-	doins mimetypes.ini
-}
diff --git a/app-misc/endeavour/endeavour-2.1.21.ebuild b/app-misc/endeavour/endeavour-2.1.21.ebuild
deleted file mode 100644
index 605b946c3069..000000000000
--- a/app-misc/endeavour/endeavour-2.1.21.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.1.21.ebuild,v 1.4 2003/06/29 23:17:15 aliz Exp $
-
-IUSE=""
-
-M=endeavour2-mimetypes
-DESCRIPTION="powerful file and image browser"
-HOMEPAGE="http://wolfpack.twu.net/Endeavour2/"
-SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2
-	ftp://wolfpack.twu.net/users/wolfpack/${M}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="sys-apps/bzip2
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.9.14"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	unpack ${M}.tgz
-
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]; then
-		# This patch fixes inverted color on big endian machines
-		einfo "Applying big endian patch..."
-		cd ${S}; patch -p0 < ${FILESDIR}/endeavour-2.1.20-bigendian.diff > /dev/null || die
-	fi
-}
-
-src_compile() {
-	./configure Linux --prefix=/usr || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodoc AUTHORS HACKING INSTALL README TODO
-
-	cd endeavour2
-
-	dobin endeavour2
-	bunzip2 endeavour2.1.bz2
-	doman endeavour2.1
-
-	dodir /usr/share/endeavour2
-	cp -R data/* ${D}/usr/share/endeavour2
-
-	cd images
-	insinto /usr/share/icons
-	doins endeavour_48x48.xpm image_browser_48x48.xpm icon_trash_48x48.xpm \
-		icon_trash_empty_48x48.xpm
-
-	# install mimetypes
-	cd ${WORKDIR}/${M}
-	mv README README.mimetypes
-	dodoc README.mimetypes
-	insinto /usr/share/endeavour2/
-	doins mimetypes.ini
-}
diff --git a/app-misc/endeavour/endeavour-2.1.20.ebuild b/app-misc/endeavour/endeavour-2.3.3.ebuild
index 1aa33f5cfde2..f045030890da 100644
--- a/app-misc/endeavour/endeavour-2.1.20.ebuild
+++ b/app-misc/endeavour/endeavour-2.3.3.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.1.20.ebuild,v 1.5 2003/06/29 23:17:15 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.3.3.ebuild,v 1.1 2003/10/01 09:49:53 hanno Exp $
+
+IUSE=""
 
 M=endeavour2-mimetypes
-DESCRIPTION="powerful file and image browser"
+DESCRIPTION="Powerful file and image browser"
 HOMEPAGE="http://wolfpack.twu.net/Endeavour2/"
 SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2
 	ftp://wolfpack.twu.net/users/wolfpack/${M}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="sys-apps/bzip2
 	=x11-libs/gtk+-1.2*
@@ -18,22 +20,15 @@ DEPEND="sys-apps/bzip2
 
 src_unpack() {
 	unpack ${P}.tar.bz2
+	epatch ${FILESDIR}/endeavour_gcc33_fix
 	unpack ${M}.tgz
-
-	#need to remove reference to ctypes.h from fio.cpp to make gcc-3.x compile the package
-	cd ${S}/endeavour2
-	mv fio.cpp fio.cpp-orig
-	sed -e "s:#include <ctype.h>://#include <ctype.h>:" fio.cpp-orig >fio.cpp
 }
 
 src_compile() {
-	cd ${P}
-	./configure Linux \
-		--prefix=/usr
+	./configure Linux --prefix=/usr || die
 	emake || die "Parallel make failed"
 }
 
-
 src_install() {
 	dodoc AUTHORS HACKING INSTALL README TODO
 
diff --git a/app-misc/endeavour/files/digest-endeavour-2.1.14 b/app-misc/endeavour/files/digest-endeavour-2.1.14
deleted file mode 100644
index 674cf4d27195..000000000000
--- a/app-misc/endeavour/files/digest-endeavour-2.1.14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0082490aa92a273fa5c655948604707c endeavour-2.1.14.tar.bz2 1492380
-MD5 dbbb7f4aa5e330be063c1b2b24495cf2 endeavour2-mimetypes.tgz 1423
diff --git a/app-misc/endeavour/files/digest-endeavour-2.1.20 b/app-misc/endeavour/files/digest-endeavour-2.1.20
deleted file mode 100644
index 4b719fef8522..000000000000
--- a/app-misc/endeavour/files/digest-endeavour-2.1.20
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ba21b69fb09ad8de34c4662aba67ab39 endeavour-2.1.20.tar.bz2 1781076
-MD5 dbbb7f4aa5e330be063c1b2b24495cf2 endeavour2-mimetypes.tgz 1423
diff --git a/app-misc/endeavour/files/digest-endeavour-2.1.21 b/app-misc/endeavour/files/digest-endeavour-2.1.21
deleted file mode 100644
index bdfbac0e0be7..000000000000
--- a/app-misc/endeavour/files/digest-endeavour-2.1.21
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 87edf2875ed3b853379e0970dda31c91 endeavour-2.1.21.tar.bz2 2255934
-MD5 dbbb7f4aa5e330be063c1b2b24495cf2 endeavour2-mimetypes.tgz 1423
diff --git a/app-misc/endeavour/files/digest-endeavour-2.3.3 b/app-misc/endeavour/files/digest-endeavour-2.3.3
new file mode 100644
index 000000000000..4293d745871a
--- /dev/null
+++ b/app-misc/endeavour/files/digest-endeavour-2.3.3
@@ -0,0 +1,2 @@
+MD5 00918de6fda1148eb1f9ffebd60f493d endeavour-2.3.3.tar.bz2 2396255
+MD5 dbbb7f4aa5e330be063c1b2b24495cf2 endeavour2-mimetypes.tgz 1423
diff --git a/app-misc/endeavour/files/endeavour_gcc33_fix b/app-misc/endeavour/files/endeavour_gcc33_fix
new file mode 100644
index 000000000000..878eae45eed4
--- /dev/null
+++ b/app-misc/endeavour/files/endeavour_gcc33_fix
@@ -0,0 +1,112 @@
+--- endeavour-2.3.3-orig/endeavour2/edvoptions.c	2003-09-13 00:33:07.000000000 +0200
++++ endeavour-2.3.3/endeavour2/edvoptions.c	2003-10-01 11:33:08.000000000 +0200
+@@ -117,65 +117,64 @@
+ 	    CDialogGetResponse(
+ #if defined(PROG_LANGUAGE_SPANISH)
+ "Borre Advertir De Método",
+-"¡Si usted borra un objeto que usa este método, entonces\n\
+-usted no será capaz de recuperar que se opone!\n\
+-\n\
+-Si usted desea usar un método más seguro de la supresión,\n\
+-escoge por favor \"MoverLos Al Cajón de la Recirculación\"\n\
+-en lugar.",
++"¡Si usted borra un objeto que usa este método, entonces\n"\
++"usted no será capaz de recuperar que se opone!\n"\
++"\n"\
++"Si usted desea usar un método más seguro de la supresión,\n"\
++"escoge por favor \"MoverLos Al Cajón de la Recirculación\"\n"\
++"en lugar.",
+ #elif defined(PROG_LANGUAGE_FRENCH)
+ "Effacer L'Avertissement De Méthode",
+-"Si vous effacez un objet en utilisant cette méthode,\n\
+-alors vous ne pourrez pas retrouver cet objet!\n\
+-\n\
+-Si vous souhaitez utiliser une méthode plus sûre de\n\
+-suppression, s'il vous plaît choisir se \"Transférer Les\n\
+-Au Recycler l'Huche\" plutôt.",
++"Si vous effacez un objet en utilisant cette méthode,\n"\
++"alors vous ne pourrez pas retrouver cet objet!\n"\
++"\n"\
++"Si vous souhaitez utiliser une méthode plus sûre de\n"\
++"suppression, s'il vous plaît choisir se \"Transférer Les\n"\
++"Au Recycler l'Huche\" plutôt.",
+ #elif defined(PROG_LANGUAGE_GERMAN)
+ "Löschen Sie Methode Warnen",
+-"Wenn Sie löschen ein Objekt benutzt diese Methode, dann\n\
+-Sie nicht werden wiedererlangen können jenes Objekt! das!\n\
+-\n\
+-Um eine sicherere Methode der Löschung zu benutzen,\n\
+-wählen Sie \"Bewegen, das Sie Zum Behälter\n\
+-Wiederverwerten\".",
++"Wenn Sie löschen ein Objekt benutzt diese Methode, dann\n"\
++"Sie nicht werden wiedererlangen können jenes Objekt! das!\n"\
++"\n"\
++"Um eine sicherere Methode der Löschung zu benutzen,\n"\
++"wählen Sie \"Bewegen, das Sie Zum Behälter\n"\
++"Wiederverwerten\".",
+ #elif defined(PROG_LANGUAGE_ITALIAN)
+ "Cancellare L'Avvertimento Di Metodo",
+-"Se lei cancella un oggetto che usando questo metodo,\n\
+-poi lei non sarà in grado di ricuperare quell'oggetto!\n\
+-\n\
+-Per usare un metodo più sicuro di soppressione, scegliere\n\
+-\"il Trasloco Loro Al Contenitore per la raccolta
+-differenziata\".",
++"Se lei cancella un oggetto che usando questo metodo,\n"\
++"poi lei non sarà in grado di ricuperare quell'oggetto!\n"\
++"\n"\
++"Per usare un metodo più sicuro di soppressione, scegliere\n"\
++"\"il Trasloco Loro Al Contenitore per la raccolta differenziata\".",
+ #elif defined(PROG_LANGUAGE_DUTCH)
+ "Schrap Methode, Die Waarschuwt",
+-"Indien u een voorwerp schrappet, dat deze methode\n\
+-gebruikt, dan zult u niet kunnen terugkrijgen die bezwaar\n\
+-heeft!\n\
+-\n\
+-Om een veiliggere methode van schrapping te gebruiken,\n\
+-kies \"Bewegen, Dat Hen Aan Het Bak Recyclen\".",
++"Indien u een voorwerp schrappet, dat deze methode\n"\
++"gebruikt, dan zult u niet kunnen terugkrijgen die bezwaar\n"\
++"heeft!\n"\
++"\n"\
++"Om een veiliggere methode van schrapping te gebruiken,\n"\
++"kies \"Bewegen, Dat Hen Aan Het Bak Recyclen\".",
+ #elif defined(PROG_LANGUAGE_PORTUGUESE)
+ "Anule Aviso De Método",
+-"Se anula um objeto que usando este método, então você\n\
+-nao será capaz de recuperar aquele objeto!\n\
+-\n\
+-Usar um método mais seguro de anulação, escolhe \"Mover\n\
+-Os À Caixa De Recycle\".",
++"Se anula um objeto que usando este método, então você\n"\
++"nao será capaz de recuperar aquele objeto!\n"\
++"\n"\
++"Usar um método mais seguro de anulação, escolhe \"Mover\n"\
++"Os À Caixa De Recycle\".",
+ #elif defined(PROG_LANGUAGE_NORWEGIAN)
+ "Stryk Method Warning",
+-"Om De stryker et objekt bruke denne metoden, da De ikke\n\
+-er kyndig utvinne det objektet! som!\n\
+-\n\
+-Bruke en sikrere metode av stryking, velg \"Moving Them To\n\
+-The Recycle Bin\".",
++"Om De stryker et objekt bruke denne metoden, da De ikke\n"\
++"er kyndig utvinne det objektet! som!\n"\
++"\n"\
++"Bruke en sikrere metode av stryking, velg \"Moving Them To\n"\
++"The Recycle Bin\".",
+ #else
+ "Delete Method Warning",
+-"If you delete an object using this method, then you\n\
+-will not be able to recover that object!\n\
+-\n\
+-To use a safer method of deletion, choose\n\
+-\"Moving Them To The Recycle Bin\"",
++"If you delete an object using this method, then you\n"\
++"will not be able to recover that object!\n"\
++"\n"\
++"To use a safer method of deletion, choose\n"\
++"\"Moving Them To The Recycle Bin\"",
+ #endif
+ 		NULL,
+ 		CDIALOG_ICON_WARNING,