remove wrong gcc4 patch

Package-Manager: portage-2.0.51.20

5 files changed, 3 insertions, 207 deletions

diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index e5a3489d04a3..afd6f4bee01b 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,7 +1,6 @@
 MD5 3a27ede8cf7f6e532ae195ce191a7a73 ChangeLog 10119
-MD5 42ee0b94e7e898da88fc0285981e2219 svgalib-1.9.19-r3.ebuild 5463
+MD5 04477db6e2e3d6a9e52f1d7a90037db6 svgalib-1.9.19-r3.ebuild 5400
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 5521852e3ebf7c90a8670fa0560b4140 svgalib-1.9.19-r1.ebuild 4919
 MD5 c136e25a99e0681344511eef09d410e6 files/svgalib-1.9.19-dont-touch-ld.conf.patch 350
 MD5 1c4684bfc1f4a5ff9daf7cbf5da699b1 files/svgalib-1.9.19-pci-get-class.patch 458
 MD5 909fa2160bfb4ca66f2f73400a711431 files/svgalib-1.9.19-devfs.patch 440
@@ -11,6 +10,4 @@ MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.pat
 MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
 MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
 MD5 4a5014126880edffad4f4f209e3e7e68 files/svgalib-1.9.19-linux2.6.patch 7776
-MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r1 66
 MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422
-MD5 dddea112cba60d8224659acccc36e224 files/svgalib-1.9.19-gcc4.patch 1198
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.19-r1 b/media-libs/svgalib/files/digest-svgalib-1.9.19-r1
deleted file mode 100644
index a0902968e62f..000000000000
--- a/media-libs/svgalib/files/digest-svgalib-1.9.19-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44e5063c9a22e9554088e125b0df7593 svgalib-1.9.19.tar.gz 935305
diff --git a/media-libs/svgalib/files/svgalib-1.9.19-gcc4.patch b/media-libs/svgalib/files/svgalib-1.9.19-gcc4.patch
deleted file mode 100644
index 92330bbee2bf..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.19-gcc4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch by Peter Gordon to fix building with gcc-4.
-
-http://bugs.gentoo.org/show_bug.cgi?id=80668
-
---- svgalib-1.9.19.orig/src/drivers/apm.c	2005-02-03 17:35:55.235794968 -0800
-+++ svgalib-1.9.19/src/drivers/apm.c	2005-02-03 17:37:49.670398264 -0800
-@@ -148,12 +148,12 @@ static int apm_saveregs(unsigned char re
-    regs[APMREG_SAVE(15)] = (k >> 8)&0xff;
-    regs[APMREG_SAVE(16)] = (k >> 16) & 0xff ;
-    regs[APMREG_SAVE(17)] = ( k >> 24 ) & 0xff ;
--   (unsigned long)regs[APMREG_SAVE(18)] = inlXR(0xf0) ;
--   (unsigned long)regs[APMREG_SAVE(22)] = inlXR(0xf4) ;
--   (unsigned long)regs[APMREG_SAVE(26)] = inlXR(0x140) ;
--   (unsigned short)regs[APMREG_SAVE(30)] = inlXR(0x144) ;
--   (unsigned long)regs[APMREG_SAVE(32)] = inXR(0x148) ;
--   (unsigned short)regs[APMREG_SAVE(36)] = inXR(0x14c) ;
-+   regs[APMREG_SAVE(18)] = (unsigned long) inlXR(0xf0) ;
-+   regs[APMREG_SAVE(22)] = (unsigned long) inlXR(0xf4) ;
-+   regs[APMREG_SAVE(26)] = (unsigned long) inlXR(0x140) ;
-+   regs[APMREG_SAVE(30)] = (unsigned short) inlXR(0x144) ;
-+   regs[APMREG_SAVE(32)] = (unsigned long) inXR(0x148) ;
-+   regs[APMREG_SAVE(36)] = (unsigned short) inXR(0x14c) ;
- 
-     return APM_TOTAL_REGS - VGA_TOTAL_REGS;
- }
diff --git a/media-libs/svgalib/svgalib-1.9.19-r1.ebuild b/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
deleted file mode 100644
index de94f59ab42b..000000000000
--- a/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19-r1.ebuild,v 1.7 2005/01/12 19:43:14 dsd Exp $
-
-inherit eutils flag-o-matic toolchain-funcs kernel-mod
-
-DESCRIPTION="A library for running svga graphics on the console"
-HOMEPAGE="http://www.svgalib.org/"
-SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build"
-
-DEPEND="virtual/libc"
-
-pkg_setup() {
-	! use build && kernel-mod_modules_supported && check_KV
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	# Get it to work with kernel 2.6
-	epatch ${FILESDIR}/${P}-linux2.6.patch
-	sed -i '/^KDIR/s:=.*:=${ROOT}/usr/src/linux:' ${S}/kernel/svgalib_helper/Makefile
-
-	# Fix include bug #54198
-	epatch ${FILESDIR}/${PN}-1.9.18-utils-include.patch
-
-	# Have lrmi compile with our $CFLAGS
-	epatch ${FILESDIR}/${PN}-1.9.18-lrmi-gentoo-cflags.patch
-
-	# -fPIC does work for lrmi, see bug #51698
-	epatch ${FILESDIR}/${P}-pic.patch
-
-	# Don't let the ebuild screw around with ld.so.conf #64829
-	epatch ${FILESDIR}/${P}-dont-touch-ld.conf.patch
-
-	# PCI functions have been renamed with newer kernels #69580
-	epatch ${FILESDIR}/${P}-pci-get-class.patch
-
-	# devfs_mk_symlink no longer available #77186
-	epatch ${FILESDIR}/${P}-devfs.patch
-
-	# Link like the other packages
-	sed -i 's:$(FLAGS):$(CFLAGS) $(LDFLAGS):' demos/Makefile || die
-}
-
-src_compile() {
-	filter-flags -fPIC
-	export CC="$(tc-getCC)"
-
-	# First build static
-	make OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!"
-	# Have to remove for shared to build ...
-	rm -f src/svgalib_helper.h
-	# Then build shared ...
-	make OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!"
-	# Missing in some cases ...
-	ln -s libvga.so.${PV} sharedlib/libvga.so
-	# Build lrmi and tools ...
-	make OPTIMIZE="${CFLAGS}" LDFLAGS="-L../sharedlib" \
-		textutils lrmi utils \
-		|| die "Failed to build libraries and utils!"
-	# Build the gl stuff tpp
-	make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!"
-	make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \
-		|| die "Failed to build libvgagl.so.${PV}!"
-	# Missing in some cases ...
-	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
-	rm -f src/svgalib_helper.h
-	make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \
-		|| die "Failed to build libvga.so.${PV}!"
-	cp -a src/libvga.so.${PV} sharedlib/
-	# Build threeDKit ...
-	make OPTIMIZE="${CFLAGS}" LDFLAGS='-L../sharedlib' \
-		-C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
-	# Build demo's ...
-	make OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS='-L../sharedlib' \
-		demoprogs || die "Failed to build demoprogs!"
-
-	if ! use build && kernel-mod_modules_supported
-	then
-		cd ${S}/kernel/svgalib_helper
-		if [[ `KV_to_int ${KV}` -lt `KV_to_int 2.6.6` ]] ; then
-			env -u ARCH \
-				make -f Makefile.alt INCLUDEDIR="${ROOT}/usr/src/linux/include" \
-					clean modules || die "Failed to build kernel module!"
-		else
-			env -u ARCH make || die "Failed to build kernel module!"
-		fi
-		cd ${S}
-	fi
-
-	cp Makefile Makefile.orig
-	sed -e 's/\(install: $(INSTALLAOUTLIB) \)installheaders \(.*\)/\1\2/g' \
-	 	Makefile.orig > Makefile
-}
-
-src_install() {
-	local x=
-
-	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-
-	make \
-		TOPDIR=${D} OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
-		install || die "Failed to install svgalib!"
-	if ! use build && kernel-mod_modules_supported
-	then
-		cd ${S}/kernel/svgalib_helper
-		if [[ `KV_to_int ${KV}` -lt `KV_to_int 2.6.6` ]] ; then
-			env -u ARCH \
-				make -f Makefile.alt TOPDIR=${D} \
-					INCLUDEDIR="${ROOT}/usr/src/linux/include" \
-					modules_install || die "Failed to install svgalib module!"
-		else
-			insinto /lib/modules/${KV}/kernel/misc
-			doins svgalib_helper.ko
-		fi
-		cd ${S}
-	fi
-
-	insinto /usr/include
-	doins gl/vgagl.h
-	dolib.a staticlib/libvga.a
-	dolib.a gl/libvgagl.a
-	dolib.a threeDKit/lib3dkit.a
-	dolib.so gl/libvgagl.so.${PV}
-	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
-	preplib
-
-	insinto /usr/include
-	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
-	doins src/keyboard/vgakeyboard.h
-
-	dodir /etc/modules.d
-	echo "probeall  /dev/svga  svgalib_helper" > ${D}/etc/modules.d/svgalib
-
-	dodir /etc/devfs.d
-	newins ${FILESDIR}/svgalib.devfs svgalib
-
-	exeinto /usr/lib/svgalib/demos
-	for x in ${S}/demos/*
-	do
-		[ -x "${x}" ] && doexe ${x}
-	done
-
-	cd ${S}/threeDKit
-	exeinto /usr/lib/svgalib/threeDKit
-	local THREED_PROGS="plane wrapdemo"
-	doexe ${THREED_PROGS}
-
-	cd ${S}
-	dodoc 0-README
-	cd ${S}/doc
-	dodoc CHANGES DESIGN TODO
-	docinto txt
-	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
-
-	mv ${D}/usr/man/* ${D}/usr/share/man
-	rmdir ${D}/usr/man
-}
-
-pkg_postinst() {
-	[ "${ROOT}" = "/" ] && /sbin/modules-update &> /dev/null
-	einfo "When upgrading your kernel you'll need to rebuild the kernel module."
-}
diff --git a/media-libs/svgalib/svgalib-1.9.19-r3.ebuild b/media-libs/svgalib/svgalib-1.9.19-r3.ebuild
index 1f56dc645137..f1c005b800d9 100644
--- a/media-libs/svgalib/svgalib-1.9.19-r3.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.19-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19-r3.ebuild,v 1.2 2005/02/06 21:05:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19-r3.ebuild,v 1.3 2005/04/24 07:24:10 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs kernel-mod
 
@@ -45,10 +45,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-pci-get-class.patch
 
 	# devfs_mk_symlink no longer available #77186
-	epatch ${FILESDIR}/${P}-devfs.patch
-
-	# Fix building with gcc-4
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	#epatch ${FILESDIR}/${P}-devfs.patch
 
 	# Link like the other packages
 	sed -i 's:$(FLAGS):$(CFLAGS) $(LDFLAGS):' demos/Makefile || die