needs unzip #69831

diff --git a/dev-games/flinker/flinker-1.72.ebuild b/dev-games/flinker/flinker-1.72.ebuild
index 829fb4e09d0dba93d46674fbad8482ba06f89f9c..c640021c3acd046ec1073d4c688c6bdf98229fd4 100644 (file)
--- a/dev-games/flinker/flinker-1.72.ebuild
+++ b/dev-games/flinker/flinker-1.72.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/flinker/flinker-1.72.ebuild,v 1.3 2004/06/24 22:10:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/flinker/flinker-1.72.ebuild,v 1.4 2004/11/03 00:10:11 vapier Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
 DESCRIPTION="GBA cart writing utility by Jeff Frohwein"
 HOMEPAGE="http://www.devrs.com/gba/software.php#misc"
@@ -13,10 +13,13 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
 S=${WORKDIR}
 
 src_compile() {
-       $(gcc-getCC) -o FLinker ${CFLAGS} fl.c || die
+       $(tc-getCC) -o FLinker ${CFLAGS} fl.c || die
 }
 
 src_install() {

diff --git a/dev-games/irrlicht/files/0.5-jpeg.patch b/dev-games/irrlicht/files/0.5-jpeg.patch
deleted file mode 100644 (file)
index 152a226..0000000
--- a/dev-games/irrlicht/files/0.5-jpeg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CImageLoaderJPG.cpp.orig   2003-12-12 19:46:00.000000000 +0100
-+++ CImageLoaderJPG.cpp        2004-02-23 02:32:05.000000000 +0100
-@@ -44,1 +44,1 @@
--u8 CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)\r
-+boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)\r
---- CImageLoaderJPG.h.orig     2003-12-20 14:21:00.000000000 +0100
-+++ CImageLoaderJPG.h  2004-02-23 02:32:48.000000000 +0100
-@@ -67,1 +67,1 @@
--      static u8 fill_input_buffer (j_decompress_ptr cinfo);\r
-+      static boolean fill_input_buffer (j_decompress_ptr cinfo);\r

diff --git a/dev-games/irrlicht/files/0.5-opengl.patch b/dev-games/irrlicht/files/0.5-opengl.patch
deleted file mode 100644 (file)
index 6e82ef7..0000000
--- a/dev-games/irrlicht/files/0.5-opengl.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- CVideoOpenGL.cpp.orig      2004-01-02 00:40:54.697754952 -0500
-+++ CVideoOpenGL.cpp   2004-01-02 00:40:16.800516208 -0500
-@@ -0,0 +1,2 @@
-+#define GL_GLEXT_LEGACY
-+#define GL_GLEXT_PROTOTYPES

diff --git a/dev-games/irrlicht/files/0.5-system-libs.patch b/dev-games/irrlicht/files/0.5-system-libs.patch
deleted file mode 100644 (file)
index dce4c40..0000000
--- a/dev-games/irrlicht/files/0.5-system-libs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig      2004-01-02 00:15:41.810748736 -0500
-+++ Makefile   2004-01-02 00:17:02.681454520 -0500
-@@ -6,14 +6,10 @@
- LIBS =  -L"/usr/X11R6/lib" -L"jpeglib" -L"zlib" --no-export-all-symbols --add-stdcall-alias -lGL -lXxf86vm -lz -ljpeg
- CXXINCS = -I"include/"
- BIN  = libIrrlicht.a
--CXXFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
-+CXXFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
- 
- all: $(LINKOBJ) $(BIN)
--      make -C jpeglib -f makefile.ansi libjpeg.a
--      make -C zlib -f Makefile
-       cp libIrrlicht.a ../lib/Linux/
--      cp zlib/libz.a ../lib/Linux
--      cp jpeglib/libjpeg.a ../lib/Linux
- 
- clean:
-       rm -f $(LINKOBJ) $(BIN)

diff --git a/dev-games/irrlicht/files/0.6-jpeg.patch b/dev-games/irrlicht/files/0.6-jpeg.patch
deleted file mode 100644 (file)
index 152a226..0000000
--- a/dev-games/irrlicht/files/0.6-jpeg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CImageLoaderJPG.cpp.orig   2003-12-12 19:46:00.000000000 +0100
-+++ CImageLoaderJPG.cpp        2004-02-23 02:32:05.000000000 +0100
-@@ -44,1 +44,1 @@
--u8 CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)\r
-+boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)\r
---- CImageLoaderJPG.h.orig     2003-12-20 14:21:00.000000000 +0100
-+++ CImageLoaderJPG.h  2004-02-23 02:32:48.000000000 +0100
-@@ -67,1 +67,1 @@
--      static u8 fill_input_buffer (j_decompress_ptr cinfo);\r
-+      static boolean fill_input_buffer (j_decompress_ptr cinfo);\r

diff --git a/dev-games/irrlicht/files/0.6-matrix4.patch b/dev-games/irrlicht/files/0.6-matrix4.patch
deleted file mode 100644 (file)
index bf5d374..0000000
--- a/dev-games/irrlicht/files/0.6-matrix4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nur irrlicht-0.6/include/matrix4.h irrlicht-0.6_new/include/matrix4.h
---- irrlicht-0.6/include/matrix4.h     2004-08-17 23:18:27.372459013 +0200
-+++ irrlicht-0.6_new/include/matrix4.h 2004-08-17 23:21:56.520925016 +0200
-@@ -186,7 +186,7 @@
-               newMatrix[8] = m1[0]*m2[8] + m1[4]*m2[9] + m1[8]*m2[10] + m1[12]*m2[11];\r
-               newMatrix[9] = m1[1]*m2[8] + m1[5]*m2[9] + m1[9]*m2[10] + m1[13]*m2[11];\r
-               newMatrix[10] = m1[2]*m2[8] + m1[6]*m2[9] + m1[10]*m2[10] + m1[14]*m2[11];\r
--              newMatrix[11] = m1[3]*m2[8] + m1[7]*m2[10] + m1[11]*m2[10] + m1[15]*m2[11];\r
-+              newMatrix[11] = m1[3]*m2[8] + m1[7]*m2[9] + m1[11]*m2[10] + m1[15]*m2[11];\r
-               \r
-               newMatrix[12] = m1[0]*m2[12] + m1[4]*m2[13] + m1[8]*m2[14] + m1[12]*m2[15];\r
-               newMatrix[13] = m1[1]*m2[12] + m1[5]*m2[13] + m1[9]*m2[14] + m1[13]*m2[15];\r
-@@ -308,7 +308,7 @@
- \r
-               f32 rotx, roty, X, Z;\r
-  \r
--              if (fabs(Y)>0.0005f) \r
-+              if (fabs(C)>0.0005f) \r
-               { \r
-                       rotx = mat(2,2) / C; \r
-                       roty = mat(2,1)  / C; \r
-@@ -320,16 +320,16 @@
-               else \r
-               {\r
-                       X  = 0.0f; \r
--                      rotx = -mat(1,1); \r
--                      roty = mat(1,0); \r
-+                      rotx = mat(1,1); \r
-+                      roty = -mat(0,1); \r
-                       Z  = atan2f( roty, rotx ) * (f32)GRAD_PI; \r
-               } \r
-  \r
--              if (fabs(X)>=360.00f) X=0.00f; \r
--              if (fabs(Y)>=360.00f) Y=0.00f; \r
--              if (fabs(Z)>=360.00f) Z=0.00f; \r
-+              if (X<0.00f) X+=360.00f; \r
-+              if (Y<0.00f) Y+=360.00f; \r
-+              if (Z<0.00f) Z+=360.00f; \r
-  \r
--              return vector3df(X,Y,Z); \r
-+              return vector3df((f32)X,(f32)Y,(f32)Z); \r
-       }\r
- \r
-       inline void matrix4::setInverseRotationRadians( const vector3df& rotation )\r

diff --git a/dev-games/irrlicht/files/0.6-opengl.patch b/dev-games/irrlicht/files/0.6-opengl.patch
deleted file mode 100644 (file)
index 6e82ef7..0000000
--- a/dev-games/irrlicht/files/0.6-opengl.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- CVideoOpenGL.cpp.orig      2004-01-02 00:40:54.697754952 -0500
-+++ CVideoOpenGL.cpp   2004-01-02 00:40:16.800516208 -0500
-@@ -0,0 +1,2 @@
-+#define GL_GLEXT_LEGACY
-+#define GL_GLEXT_PROTOTYPES

diff --git a/dev-games/irrlicht/files/0.6-system-libs.patch b/dev-games/irrlicht/files/0.6-system-libs.patch
deleted file mode 100644 (file)
index dce4c40..0000000
--- a/dev-games/irrlicht/files/0.6-system-libs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig      2004-01-02 00:15:41.810748736 -0500
-+++ Makefile   2004-01-02 00:17:02.681454520 -0500
-@@ -6,14 +6,10 @@
- LIBS =  -L"/usr/X11R6/lib" -L"jpeglib" -L"zlib" --no-export-all-symbols --add-stdcall-alias -lGL -lXxf86vm -lz -ljpeg
- CXXINCS = -I"include/"
- BIN  = libIrrlicht.a
--CXXFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
-+CXXFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
- 
- all: $(LINKOBJ) $(BIN)
--      make -C jpeglib -f makefile.ansi libjpeg.a
--      make -C zlib -f Makefile
-       cp libIrrlicht.a ../lib/Linux/
--      cp zlib/libz.a ../lib/Linux
--      cp jpeglib/libjpeg.a ../lib/Linux
- 
- clean:
-       rm -f $(LINKOBJ) $(BIN)

diff --git a/dev-games/irrlicht/files/digest-irrlicht-0.5 b/dev-games/irrlicht/files/digest-irrlicht-0.5
deleted file mode 100644 (file)
index c6782c5..0000000
--- a/dev-games/irrlicht/files/digest-irrlicht-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57398d83776e53afc5e52d340198c92b irrlicht-0.5.zip 10741280

diff --git a/dev-games/irrlicht/files/digest-irrlicht-0.6-r1 b/dev-games/irrlicht/files/digest-irrlicht-0.6-r1
deleted file mode 100644 (file)
index 5eeb980..0000000
--- a/dev-games/irrlicht/files/digest-irrlicht-0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 561712d3be7182a5c4cf18414caf9c46 irrlicht-0.6.zip 10505981

diff --git a/dev-games/irrlicht/irrlicht-0.5.ebuild b/dev-games/irrlicht/irrlicht-0.5.ebuild
deleted file mode 100644 (file)
index 22b9a8a..0000000
--- a/dev-games/irrlicht/irrlicht-0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.5.ebuild,v 1.2 2004/06/24 22:11:56 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="open source high performance realtime 3D engine written in C++"
-HOMEPAGE="http://irrlicht.sourceforge.net/"
-SRC_URI="mirror://sourceforge/irrlicht/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="doc"
-
-DEPEND="media-libs/jpeg
-       sys-libs/zlib
-       virtual/opengl
-       virtual/x11"
-
-S=${WORKDIR}
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       cd source
-       unzip -qo source.zip || die "unpacking source.zip"
-       rm -rf source.zip zlib jpeglib
-       ln -s /usr/include jpeglib
-       ln -s /usr/include zlib
-       epatch ${FILESDIR}/${PV}-system-libs.patch
-       epatch ${FILESDIR}/${PV}-jpeg.patch
-       epatch ${FILESDIR}/${PV}-opengl.patch
-}
-
-src_compile() {
-       cd source
-       emake || die
-}
-
-src_install() {
-       dolib.a lib/Linux/libIrrlicht.a
-       insinto /usr/include/${PN}
-       doins include/*
-       dodoc changes.txt readme.txt
-       use doc && cp -r examples media ${D}/usr/share/doc/${PF}/
-}

diff --git a/dev-games/irrlicht/irrlicht-0.6-r1.ebuild b/dev-games/irrlicht/irrlicht-0.6-r1.ebuild
deleted file mode 100644 (file)
index 2bc8e21..0000000
--- a/dev-games/irrlicht/irrlicht-0.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.6-r1.ebuild,v 1.1 2004/08/19 11:03:36 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="open source high performance realtime 3D engine written in C++"
-HOMEPAGE="http://irrlicht.sourceforge.net/"
-SRC_URI="mirror://sourceforge/irrlicht/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-
-DEPEND="media-libs/jpeg
-       sys-libs/zlib
-       virtual/opengl
-       virtual/x11"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}/source
-       unzip -qo source.zip || die "unpacking source.zip"
-       rm -rf source.zip zlib jpeglib
-       ln -s /usr/include jpeglib
-       ln -s /usr/include zlib
-       epatch "${FILESDIR}/${PV}-system-libs.patch"
-       epatch "${FILESDIR}/${PV}-jpeg.patch"
-       epatch "${FILESDIR}/${PV}-opengl.patch"
-       epatch "${FILESDIR}/${PV}-matrix4.patch"
-}
-
-src_compile() {
-       cd source
-       emake || die "emake failed"
-}
-
-src_install() {
-       dolib.a lib/Linux/libIrrlicht.a
-       insinto /usr/include/${PN}
-       doins include/*
-       dodoc changes.txt readme.txt
-       use doc && cp -r examples media "${D}/usr/share/doc/${PF}/"
-}

diff --git a/dev-games/irrlicht/irrlicht-0.7.ebuild b/dev-games/irrlicht/irrlicht-0.7.ebuild
index 151b0ecb371211c6ff5c1ed060f14ffff077172d..c8621501d6e972e6a6f57039a89831f263e8a472 100644 (file)
--- a/dev-games/irrlicht/irrlicht-0.7.ebuild
+++ b/dev-games/irrlicht/irrlicht-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.7.ebuild,v 1.1 2004/09/13 05:53:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.7.ebuild,v 1.2 2004/11/03 00:12:00 vapier Exp $
 
 inherit eutils
 
@@ -10,13 +10,15 @@ SRC_URI="mirror://sourceforge/irrlicht/${P}.zip"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
 IUSE="doc"
 
-DEPEND="media-libs/jpeg
+RDEPEND="media-libs/jpeg
        sys-libs/zlib
        virtual/opengl
        virtual/x11"
+DEPEND="${RDEPEND}
+       app-arch/unzip"
 
 src_unpack() {
        unpack ${A}
@@ -27,9 +29,9 @@ src_unpack() {
        rm -rf zlib jpeglib
        ln -s /usr/include jpeglib
        ln -s /usr/include zlib
-       epatch "${FILESDIR}/${PV}-system-libs.patch" || die "system libs patch failed"
-       epatch "${FILESDIR}/${PV}-jpeg.patch" || die "JPEG patch failed"
-       epatch "${FILESDIR}/${PV}-opengl.patch" || die "OpenGL patch failed"
+       epatch "${FILESDIR}/${PV}-system-libs.patch"
+       epatch "${FILESDIR}/${PV}-jpeg.patch"
+       epatch "${FILESDIR}/${PV}-opengl.patch"
 }
 
 src_compile() {