stupid setuid bits BEGONE

6 files changed, 27 insertions, 80 deletions

diff --git a/media-gfx/zgv/ChangeLog b/media-gfx/zgv/ChangeLog
index c8a8e6e4284f..059b690a49d2 100644
--- a/media-gfx/zgv/ChangeLog
+++ b/media-gfx/zgv/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for media-gfx/zgv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.6 2003/10/07 06:49:29 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.7 2004/01/23 04:51:13 vapier Exp $
 
-  07 Oct 2003; Brandy Westcott brandy@gentoo.org zgv-5.7.ebuild:
-  Added sys-apps/gawk as a dependency
+*zgv-5.7-r1 (22 Jan 2004)
+
+  22 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Remove setuid bit since you dont need them with svgalib-1.9.x.
 
 *zgv-5.7 (03 Oct 2003)
 
+  07 Oct 2003; Brandy Westcott brandy@gentoo.org zgv-5.7.ebuild:
+  Added sys-apps/gawk as a dependency
+
   03 Oct 2003; Heinrich Wendel <lanius@gentoo.org> zgv-5.7.ebuild,
   files/zgv-5.7-gcc3.patch:
   version bump
diff --git a/media-gfx/zgv/files/digest-zgv-5.6 b/media-gfx/zgv/files/digest-zgv-5.6
deleted file mode 100644
index a4be0d1732b7..000000000000
--- a/media-gfx/zgv/files/digest-zgv-5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2fcebede049f83854924e5c9f40555a zgv-5.6.tar.gz 336109
diff --git a/media-gfx/zgv/files/digest-zgv-5.7 b/media-gfx/zgv/files/digest-zgv-5.7-r1
index 7df94e21d9c1..7df94e21d9c1 100644
--- a/media-gfx/zgv/files/digest-zgv-5.7
+++ b/media-gfx/zgv/files/digest-zgv-5.7-r1
diff --git a/media-gfx/zgv/files/zgv-5.7-gcc3.patch b/media-gfx/zgv/files/zgv-5.7-gcc3.patch
index 6c44c16a150a..7a43849834ef 100644
--- a/media-gfx/zgv/files/zgv-5.7-gcc3.patch
+++ b/media-gfx/zgv/files/zgv-5.7-gcc3.patch
@@ -1,6 +1,6 @@
-diff -u orig/bdf2h.c new/bdf2h.c
---- orig/bdf2h.c	2003-10-03 06:05:53.573182320 +0200
-+++ new/bdf2h.c	2003-10-03 06:16:07.603835472 +0200
+diff -u src.orig/bdf2h.c src/bdf2h.c
+--- src.orig/bdf2h.c	2003-10-03 06:05:53.573182320 +0200
++++ src/bdf2h.c	2003-10-03 06:16:07.603835472 +0200
 @@ -45,14 +45,14 @@
   */
  printf("#ifndef DEFINED_STRUCT_FONTINFO_TAG\n");
@@ -24,9 +24,9 @@ diff -u orig/bdf2h.c new/bdf2h.c
  printf("#endif\n\n");
  
  /* generate font data */
-diff -u orig/font.c new/font.c
---- orig/font.c	2003-10-03 06:05:53.573182320 +0200
-+++ new/font.c	2003-10-03 06:06:10.775567160 +0200
+diff -u src.orig/font.c src/font.c
+--- src.orig/font.c	2003-10-03 06:05:53.573182320 +0200
++++ src/font.c	2003-10-03 06:06:10.775567160 +0200
 @@ -37,9 +37,9 @@
   * best have this:
   */
@@ -40,9 +40,9 @@ diff -u orig/font.c new/font.c
  
  
  /* prototypes */
-diff -u orig/install-info.c new/install-info.c
---- orig/install-info.c	2003-10-03 06:05:53.573182320 +0200
-+++ new/install-info.c	2003-10-03 06:06:10.775567160 +0200
+diff -u src.orig/install-info.c src/install-info.c
+--- src.orig/install-info.c	2003-10-03 06:05:53.573182320 +0200
++++ src/install-info.c	2003-10-03 06:06:10.775567160 +0200
 @@ -309,38 +309,38 @@
  void
  print_help ()
diff --git a/media-gfx/zgv/zgv-5.6.ebuild b/media-gfx/zgv/zgv-5.6.ebuild
deleted file mode 100644
index 71ec08457425..000000000000
--- a/media-gfx/zgv/zgv-5.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.6.ebuild,v 1.8 2003/09/06 23:56:39 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A svgalib console image viewer."
-SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"
-HOMEPAGE="http://www.svgalib.org/rus/zgv"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=media-libs/svgalib-1.4.2
-	>=media-libs/jpeg-6b-r2
-	media-libs/libpng
-	>=media-libs/tiff-3.5.5
-	>=sys-libs/zlib-1.1.4"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/src
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -fomit-frame-pointer -finline-functions:${CFLAGS}:" \
-		Makefile.orig > Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
-	make PREFIX=${D}/usr \
-		INFODIR=${D}/usr/share/info \
-		MANDIR=${D}/usr/share/man/man1 \
-		install || die
-
-	# Fix info files
-	cd ${D}/usr/share/info
-	rm dir*
-	mv zgv zgv.info
-	for i in 1 2 3 4
-	do
-		mv zgv-$i zgv.info-$i
-	done
-	cd ${S}
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* SECURITY TODO
-}
diff --git a/media-gfx/zgv/zgv-5.7.ebuild b/media-gfx/zgv/zgv-5.7-r1.ebuild
index 31f74974b892..852719cb4e32 100644
--- a/media-gfx/zgv/zgv-5.7.ebuild
+++ b/media-gfx/zgv/zgv-5.7-r1.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.7.ebuild,v 1.2 2003/10/07 06:49:29 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.7-r1.ebuild,v 1.1 2004/01/23 04:51:13 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A svgalib console image viewer."
+DESCRIPTION="A svgalib console image viewer"
+HOMEPAGE="http://www.svgalib.org/rus/zgv/"
 SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"
-HOMEPAGE="http://www.svgalib.org/rus/zgv"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86"
 
 DEPEND=">=media-libs/svgalib-1.4.2
 	>=media-libs/jpeg-6b-r2
@@ -20,11 +19,9 @@ DEPEND=">=media-libs/svgalib-1.4.2
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}/src
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -fomit-frame-pointer -finline-functions:${CFLAGS}:" \
-		Makefile.orig > Makefile
+	cd ${S}
+	sed -i "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk
+	sed -i "s:4755:0755:" src/Makefile
 	epatch ${FILESDIR}/${P}-gcc3.patch
 }
 
@@ -38,16 +35,13 @@ src_install() {
 		INFODIR=${D}/usr/share/info \
 		MANDIR=${D}/usr/share/man/man1 \
 		install || die
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* SECURITY TODO
 
 	# Fix info files
 	cd ${D}/usr/share/info
 	rm dir*
 	mv zgv zgv.info
-	for i in 1 2 3 4
-	do
+	for i in 1 2 3 4 ; do
 		mv zgv-$i zgv.info-$i
 	done
-	cd ${S}
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* SECURITY TODO
 }