Remove old ebuild. Bundled up patches in one file and sent them to mirrors. Use epatch instead of patch and emake instead of make.

Package-Manager: portage-2.0.52-r1

11 files changed, 35 insertions, 270 deletions

diff --git a/app-emulation/pose/ChangeLog b/app-emulation/pose/ChangeLog
index 46615c053128..cfd20ce7da91 100644
--- a/app-emulation/pose/ChangeLog
+++ b/app-emulation/pose/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/pose
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/ChangeLog,v 1.15 2005/04/19 15:51:33 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/ChangeLog,v 1.16 2005/09/30 21:26:05 vanquirius Exp $
+
+  30 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/gcc-3.3_fix.diff.bz2, -files/choose-gl.diff,
+  -files/detect-fluid.diff, -files/init-clipwidget.diff,
+  -files/separate-builddir.diff, -pose-3.5-r1.ebuild, pose-3.5-r4.ebuild:
+  Remove old ebuild. Bundled up patches in one file and sent them to mirrors.
+  Use epatch instead of patch and emake instead of make.
 
   19 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
   pose-3.5-r1.ebuild, pose-3.5-r4.ebuild:
diff --git a/app-emulation/pose/Manifest b/app-emulation/pose/Manifest
index ff5eb29d5706..9f0cb8972eea 100644
--- a/app-emulation/pose/Manifest
+++ b/app-emulation/pose/Manifest
@@ -1,11 +1,4 @@
-MD5 f694d2a59b5e798e32c3be70a8ba517a pose-3.5-r1.ebuild 2047
-MD5 edea1518839a7d63e80d40df5cc1b6a4 pose-3.5-r4.ebuild 2169
-MD5 eb1b7422eb4362c38a5142f7a551cc2b ChangeLog 2372
+MD5 850c0250e39036c9fbd33501e7ae89f3 pose-3.5-r4.ebuild 2149
+MD5 faf87572296dbb564085d53c51d33a5f ChangeLog 2750
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 36734bf153faeb688279a79e5da1769b files/choose-gl.diff 666
-MD5 dbef5e8a7e42d97ef76d763fab5090e1 files/init-clipwidget.diff 486
-MD5 90145d8ed014f39eb749610c2effa942 files/digest-pose-3.5-r1 140
-MD5 99bd1bea9a79c798b2bd9c5534b52fd1 files/digest-pose-3.5-r4 69
-MD5 cfbe27dfd96b63e7d178676a16b39b19 files/separate-builddir.diff 2420
-MD5 7c326f33b70eba59b3f6a1949e2270a2 files/detect-fluid.diff 1946
-MD5 3adbabe4753e34bc04ef685b74afd27e files/gcc-3.3_fix.diff.bz2 5023
+MD5 4d917375e3e985849a97c501b7a3abd3 files/digest-pose-3.5-r4 139
diff --git a/app-emulation/pose/files/choose-gl.diff b/app-emulation/pose/files/choose-gl.diff
deleted file mode 100644
index f174c0ab8f5f..000000000000
--- a/app-emulation/pose/files/choose-gl.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- Emulator_Src_3.4/BuildUnix/configure.in.orig	Thu Feb 21 23:06:38 2002
-+++ Emulator_Src_3.4/BuildUnix/configure.in	Thu Feb 21 23:05:57 2002
-@@ -321,6 +321,13 @@
- 
- GLLIB=
- 
-+dnl When we go to FLTK 1.1 this will get easier: we will be able to ask
-+dnl FLTK whether it needs GL via fltk-config
-+
-+AC_ARG_ENABLE(gl,
-+	[  --disable-gl             use OpenGL (default yes)])
-+
-+if test x$enable_gl != xno; then
- AC_CHECK_HEADER(GL/gl.h,
- 	AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB="-lGL", \
- 		AC_CHECK_LIB(MesaGL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGL",,\
-@@ -337,6 +344,7 @@
- 		GLLIB="-lMesaGLU $GLLIB"
- 	fi
- )
-+fi
- 
- AC_SUBST(GLLIB)
- 
diff --git a/app-emulation/pose/files/detect-fluid.diff b/app-emulation/pose/files/detect-fluid.diff
deleted file mode 100644
index 5d2795d2b039..000000000000
--- a/app-emulation/pose/files/detect-fluid.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urNp orig-Emulator_Src_3.4/BuildUnix/Makefile.am Emulator_Src_3.4/BuildUnix/Makefile.am
---- orig-Emulator_Src_3.4/BuildUnix/Makefile.am	Thu Jan 31 02:55:31 2002
-+++ Emulator_Src_3.4/BuildUnix/Makefile.am	Mon Feb 18 10:48:21 2002
-@@ -415,7 +415,7 @@ ResStrings.cpp: $(srcdir)/../SrcShared/S
- 	perl -x $(srcdir)/../SrcShared/Strings.txt
- 
- EmDlgFltkFactory.h EmDlgFltkFactory.cpp : $(srcdir)/../SrcUnix/EmDlgFltkFactory.fl
--	fluid -c $(srcdir)/../SrcUnix/EmDlgFltkFactory.fl
-+	$(FLUID) -c $(srcdir)/../SrcUnix/EmDlgFltkFactory.fl
- 
- EmDlgFltk.o : EmDlgFltkFactory.h
- 
-diff -urNp orig-Emulator_Src_3.4/BuildUnix/configure.in Emulator_Src_3.4/BuildUnix/configure.in
---- orig-Emulator_Src_3.4/BuildUnix/configure.in	Thu Jan 31 02:55:25 2002
-+++ Emulator_Src_3.4/BuildUnix/configure.in	Mon Feb 18 10:48:21 2002
-@@ -34,6 +34,9 @@ AC_ARG_WITH(fltk,
- 	[  --with-fltk=DIR         use FLTK in DIR], [
- 	CPPFLAGS="${CPPFLAGS} -I$withval/include"
- 	LDFLAGS="${LDFLAGS} -L$withval/lib"
-+	if test "${FLUID+set}" != set; then
-+		test -r $withval/bin/fluid && FLUID=$withval/bin/fluid
-+	fi
- ])
- 
- 
-@@ -340,7 +343,8 @@ AC_SUBST(GLLIB)
- 
- dnl ========================================================
- dnl Make sure FLTK is available.  It must be installed on
--dnl a standard path, or on $x_libraries.
-+dnl a standard path, or on $x_libraries.  Also check that
-+dnl fluid is available (in PATH, or via --with-fltk).
- dnl ========================================================
- 
- AC_CACHE_SAVE
-@@ -355,8 +359,11 @@ AC_CACHE_CHECK([for 'int fl_height (void
- 		pose_cv_lib_fltk_found=yes, pose_cv_lib_fltk_found=no))
- 
- LIBS="$save_LIBS"
-+ 
-+dnl $FLUID may have already been set by --with-fltk, above
-+AC_CHECK_PROG(FLUID, fluid, fluid, no)
- 
--if test $pose_cv_lib_fltk_found = yes; then
-+if test $pose_cv_lib_fltk_found = yes && test $FLUID != no; then
- 	AC_DEFINE(HAVE_LIBFLTK)
- else
- 	AC_MSG_ERROR(*** FLTK *must* be installed before running configure. ***)
diff --git a/app-emulation/pose/files/digest-pose-3.5-r1 b/app-emulation/pose/files/digest-pose-3.5-r1
deleted file mode 100644
index 662101a539e1..000000000000
--- a/app-emulation/pose/files/digest-pose-3.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c69b10798e524b999739bf1950125655 emulator_src_3.5.tar.gz 3162363
-MD5 e917767d012bcd8953a5d811e68134ff fltk-1.0.11-source.tar.bz2 999099
diff --git a/app-emulation/pose/files/digest-pose-3.5-r4 b/app-emulation/pose/files/digest-pose-3.5-r4
index 6f7eb38e3cc3..de259cfc3bc2 100644
--- a/app-emulation/pose/files/digest-pose-3.5-r4
+++ b/app-emulation/pose/files/digest-pose-3.5-r4
@@ -1 +1,2 @@
 MD5 c69b10798e524b999739bf1950125655 emulator_src_3.5.tar.gz 3162363
+MD5 6befe71b018db9d1384ad75b84b71e21 pose-3.5-genpatches.tar.bz2 8024
diff --git a/app-emulation/pose/files/gcc-3.3_fix.diff.bz2 b/app-emulation/pose/files/gcc-3.3_fix.diff.bz2
deleted file mode 100644
index b0a6f6d717ec..000000000000
--- a/app-emulation/pose/files/gcc-3.3_fix.diff.bz2
+++ /dev/null
diff --git a/app-emulation/pose/files/init-clipwidget.diff b/app-emulation/pose/files/init-clipwidget.diff
deleted file mode 100644
index ef99aeafd7f6..000000000000
--- a/app-emulation/pose/files/init-clipwidget.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- SrcUnix/EmApplicationFltk.cpp.orig	Tue Apr 16 12:51:13 2002
-+++ SrcUnix/EmApplicationFltk.cpp	Tue Apr 16 12:51:28 2002
-@@ -115,6 +115,7 @@
- 
- EmApplicationFltk::EmApplicationFltk (void) :
- 	EmApplication (),
-+	fClipboardWidget (NULL),
- 	fAppWindow (NULL)
- {
- 	EmAssert (gHostApplication == NULL);
-@@ -138,6 +139,7 @@
- EmApplicationFltk::~EmApplicationFltk (void)
- {
- 	delete fAppWindow;
-+	delete fClipboardWidget;
- 
- 	EmAssert (gHostApplication == this);
- 	gHostApplication = NULL;
diff --git a/app-emulation/pose/files/separate-builddir.diff b/app-emulation/pose/files/separate-builddir.diff
deleted file mode 100644
index aa8292b2da12..000000000000
--- a/app-emulation/pose/files/separate-builddir.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urNp orig-Emulator_Src_3.4/BuildUnix/Gzip/Makefile.am Emulator_Src_3.4/BuildUnix/Gzip/Makefile.am
---- orig-Emulator_Src_3.4/BuildUnix/Gzip/Makefile.am	Thu Jan 31 02:55:25 2002
-+++ Emulator_Src_3.4/BuildUnix/Gzip/Makefile.am	Mon Feb 18 10:55:27 2002
-@@ -8,7 +8,7 @@
- ##
- SUFFIXES =	.cpp
- 
--VPATH =		$(srcdir)/../../SrcShared/Gzip:
-+VPATH =		$(srcdir):$(srcdir)/../../SrcShared/Gzip:
- 
- ## no subdir specific flags needed -- just go with globals
- LOCAL_CFLAGS =
-diff -urNp orig-Emulator_Src_3.4/BuildUnix/Makefile.am Emulator_Src_3.4/BuildUnix/Makefile.am
---- orig-Emulator_Src_3.4/BuildUnix/Makefile.am	Thu Jan 31 02:55:31 2002
-+++ Emulator_Src_3.4/BuildUnix/Makefile.am	Mon Feb 18 10:55:27 2002
-@@ -8,7 +8,8 @@ SUBDIRS			=	Gzip jpeg espws-2.0
- 
- SUFFIXES		=	.cpp
- 
--VPATH			=	$(srcdir)/../SrcUnix:					\
-+VPATH			=	$(srcdir):								\
-+					$(srcdir)/../SrcUnix:					\
- 					$(srcdir)/../SrcShared:					\
- 					$(srcdir)/../SrcShared/Hardware:		\
- 					$(srcdir)/../SrcShared/Hardware/TRG:	\
-@@ -402,9 +403,9 @@ endif
- 
- bin_PROGRAMS	=	pose
- 
--pose_LDADD		=	$(srcdir)/Gzip/libposergzip.a
--pose_LDADD		+=	$(srcdir)/jpeg/libposerjpeg.a
--pose_LDADD		+=	$(srcdir)/espws-2.0/libposerespws.a
-+pose_LDADD		=	Gzip/libposergzip.a
-+pose_LDADD		+=	jpeg/libposerjpeg.a
-+pose_LDADD		+=	espws-2.0/libposerespws.a
- pose_LDADD		+=	-lfltk
- pose_LDADD		+=	-L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) $(GLLIB) -lm
- 
-diff -urNp orig-Emulator_Src_3.4/BuildUnix/espws-2.0/Makefile.am Emulator_Src_3.4/BuildUnix/espws-2.0/Makefile.am
---- orig-Emulator_Src_3.4/BuildUnix/espws-2.0/Makefile.am	Thu Jan 31 02:55:25 2002
-+++ Emulator_Src_3.4/BuildUnix/espws-2.0/Makefile.am	Mon Feb 18 10:55:27 2002
-@@ -9,7 +9,7 @@
- ##
- SUFFIXES		=	.cxx
- 
--VPATH			=	$(srcdir)/../../SrcUnix/espws-2.0:
-+VPATH			=	$(srcdir):$(srcdir)/../../SrcUnix/espws-2.0:
- 
- CFLAGS			=   $(POSER_CFLAGS) $(LOCAL_CFLAGS) $(X_CFLAGS)
- CXXFLAGS		= 	$(POSER_CXXFLAGS) $(LOCAL_CFLAGS) $(X_CFLAGS)
-diff -urNp orig-Emulator_Src_3.4/BuildUnix/jpeg/Makefile.am Emulator_Src_3.4/BuildUnix/jpeg/Makefile.am
---- orig-Emulator_Src_3.4/BuildUnix/jpeg/Makefile.am	Thu Jan 31 02:55:25 2002
-+++ Emulator_Src_3.4/BuildUnix/jpeg/Makefile.am	Mon Feb 18 10:55:27 2002
-@@ -9,7 +9,7 @@
- ##
- SUFFIXES		=	.cpp
- 
--VPATH			=	$(srcdir)/../../SrcShared/jpeg:
-+VPATH			=	$(srcdir):$(srcdir)/../../SrcShared/jpeg:
- 
- ## no subdir specific flags needed -- just go with globals
- LOCAL_CFLAGS	=
diff --git a/app-emulation/pose/pose-3.5-r1.ebuild b/app-emulation/pose/pose-3.5-r1.ebuild
deleted file mode 100644
index 43bfa34e413f..000000000000
--- a/app-emulation/pose/pose-3.5-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/pose-3.5-r1.ebuild,v 1.12 2005/04/19 15:51:33 wormo Exp $
-
-S=${WORKDIR}/Emulator_Src_3.5
-FLTK_PV=1.0.11
-FLTK_S=${WORKDIR}/fltk-${FLTK_PV}
-DESCRIPTION="Palm OS Emulator"
-HOMEPAGE="http://www.palmos.com/dev/tools/emulator/"
-SRC_URI="http://www.palmos.com/dev/tools/emulator/sources/emulator_src_3.5.tar.gz
-	ftp://www.easysw.com/pub/fltk/${FLTK_PV}/fltk-${FLTK_PV}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack emulator_src_3.5.tar.gz
-	unpack fltk-${FLTK_PV}-source.tar.bz2
-
-	cd ${S}
-	patch -p1 < ${FILESDIR}/detect-fluid.diff || die "Patching failed"
-	patch -p1 < ${FILESDIR}/separate-builddir.diff || die "Patching failed"
-	patch -p1 < ${FILESDIR}/choose-gl.diff || die "Patching failed"
-	patch -p0 < ${FILESDIR}/init-clipwidget.diff || die "Patching failed"
-	cd ${S}/BuildUnix
-	aclocal
-	automake --foreign
-	autoconf
-
-	cd ${S}
-	mkdir install-fltk
-	mkdir static-libs
-	mkdir build-normal
-	mkdir build-profile
-
-	cd ${S}/static-libs
-	ln -sf `g++ -print-file-name=libstdc++.a` libstdc++.a
-}
-
-src_compile() {
-	cd ${FLTK_S}
-	./configure --prefix=${S}/install-fltk --disable-gl --disable-shared || die
-	make || die
-	make install || die
-
-	cd ${S}/build-normal
-	LDFLAGS=-L${S}/static-libs ../BuildUnix/configure --prefix=/usr \
-		--with-fltk=${S}/install-fltk \
-		--disable-gl || die
-
-	make || die
-
-#	cd ${S}/build-profile
-#	LDFLAGS=-L${S}/static-libs ../BuildUnix/configure --prefix=/usr \
-#		--with-fltk=${S}/install-fltk \
-#		--disable-gl --enable-palm-profile || die
-#
-#	make || die
-}
-
-src_install() {
-	cd ${S}/build-normal
-	dobin pose
-
-#	cd ${S}/build-profile
-#	newbin pose pose-profile
-
-	cd ${S}/Docs
-	dodoc *.txt *.rtf
-	dohtml *.html
-	insinto /usr/share/doc/${PF}
-	doins *.pdf
-
-	dodir /usr/share/pose/downloads
-	dodir /usr/share/pose/roms
-
-	cd ${S}/ROMTransfer/Source
-	insinto /usr/share/pose/downloads
-	doins *.prc
-}
-
diff --git a/app-emulation/pose/pose-3.5-r4.ebuild b/app-emulation/pose/pose-3.5-r4.ebuild
index 85fa1b761dcf..90e9a10249aa 100644
--- a/app-emulation/pose/pose-3.5-r4.ebuild
+++ b/app-emulation/pose/pose-3.5-r4.ebuild
@@ -1,10 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/pose-3.5-r4.ebuild,v 1.5 2005/04/19 15:51:33 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/pose-3.5-r4.ebuild,v 1.6 2005/09/30 21:26:05 vanquirius Exp $
 
-S=${WORKDIR}/Emulator_Src_3.5
+inherit eutils
+
+S="${WORKDIR}/Emulator_Src_3.5"
 HOMEPAGE="http://www.palmos.com/dev/tools/emulator/"
-SRC_URI="http://www.palmos.com/dev/tools/emulator/sources/emulator_src_3.5.tar.gz"
+SRC_URI="http://www.palmos.com/dev/tools/emulator/sources/emulator_src_3.5.tar.gz
+	mirror://gentoo/${P}-genpatches.tar.bz2
+	http://dev.gentoo.org/~vanquirius/files/${P}-genpatches.tar.bz2"
 
 DESCRIPTION="Palm OS Emulator"
 
@@ -16,16 +20,15 @@ SLOT="0"
 IUSE=""
 
 src_unpack() {
-	unpack emulator_src_3.5.tar.gz
+	unpack ${A}; cd "${S}"
 
-	cd ${S}
-	patch -p1 < ${FILESDIR}/detect-fluid.diff || die "Patching failed"
-	patch -p1 < ${FILESDIR}/separate-builddir.diff || die "Patching failed"
-	patch -p1 < ${FILESDIR}/choose-gl.diff || die "Patching failed"
-	patch -p0 < ${FILESDIR}/init-clipwidget.diff || die "Patching failed"
-	bzcat ${FILESDIR}/gcc-3.3_fix.diff.bz2 | patch -p1 || die "Patching failed"
+	epatch "${WORKDIR}"/detect-fluid.diff
+	epatch "${WORKDIR}"/separate-builddir.diff
+	epatch "${WORKDIR}"/choose-gl.diff
+	epatch "${WORKDIR}"/init-clipwidget.diff
+	epatch "${WORKDIR}"/gcc-3.3_fix.diff.bz2
 
-	cd ${S}/BuildUnix
+	cd "${S}"/BuildUnix
 	aclocal
 	automake --foreign
 	autoconf
@@ -33,7 +36,7 @@ src_unpack() {
 	sed -i -e "s:-DPLATFORM_UNIX:-DFLTK_1_0_COMPAT -DPLATFORM_UNIX:" \
 		-e "s:-O2:-O2 -fno-strict-aliasing:" configure
 
-	cd ${S}
+	cd "${S}"
 	mkdir install-fltk
 	ln -s /usr/include/fltk-1.1 install-fltk/include
 	ln -s /usr/lib/fltk-1.1 install-fltk/lib
@@ -41,18 +44,18 @@ src_unpack() {
 	mkdir build-normal
 #	mkdir build-profile
 
-	cd ${S}/static-libs
+	cd "${S}"/static-libs
 	ln -sf `g++ -print-file-name=libstdc++.a` libstdc++.a
 }
 
 src_compile() {
-	cd ${S}/build-normal
+	cd "${S}"/build-normal
 #	cd ${S}/BuildUnix
-	LDFLAGS=-L${S}/static-libs ../BuildUnix/configure --prefix=/usr \
-		--with-fltk=${S}/install-fltk \
+	LDFLAGS=-L"${S}"/static-libs ../BuildUnix/configure --prefix=/usr \
+		--with-fltk="${S}"/install-fltk \
 		--disable-gl || die
 
-	make || die
+	emake || die
 
 #	cd ${S}/build-profile
 #	LDFLAGS=-L${S}/static-libs ../BuildUnix/configure --prefix=/usr \
@@ -63,13 +66,13 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}/build-normal
+	cd "${S}"/build-normal
 	dobin pose
 
 #	cd ${S}/build-profile
 #	newbin pose pose-profile
 
-	cd ${S}/Docs
+	cd "${S}"/Docs
 	dodoc *.txt *.rtf
 	dohtml *.html
 	insinto /usr/share/doc/${PF}
@@ -78,7 +81,7 @@ src_install() {
 	dodir /usr/share/pose/downloads
 	dodir /usr/share/pose/roms
 
-	cd ${S}/ROMTransfer/Source
+	cd "${S}"/ROMTransfer/Source
 	insinto /usr/share/pose/downloads
 	doins *.prc
 }