Bumped to new revision for LiveCD and closing bug #54870.

7 files changed, 14 insertions, 48 deletions

diff --git a/x11-misc/mkxf86config/ChangeLog b/x11-misc/mkxf86config/ChangeLog
index fece9e2b17cf..dba95ed8b95c 100644
--- a/x11-misc/mkxf86config/ChangeLog
+++ b/x11-misc/mkxf86config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/mkxf86config
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/ChangeLog,v 1.5 2004/05/14 15:28:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/ChangeLog,v 1.6 2004/06/23 12:01:28 wolf31o2 Exp $
+
+*mkxf86config-0.8-r2 (23 Jun 2004)
+
+  23 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  -mkxf86config-0.8-r1.ebuild, +mkxf86config-0.8-r2.ebuild,
+  -mkxf86config-0.8.ebuild:
+  Bumped to new revision for LiveCD and closing bug #54870.
 
   14 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
   Changing maintainers to newly created livecd herd.
diff --git a/x11-misc/mkxf86config/Manifest b/x11-misc/mkxf86config/Manifest
index b2107e1cd6e1..363c66cb8a05 100644
--- a/x11-misc/mkxf86config/Manifest
+++ b/x11-misc/mkxf86config/Manifest
@@ -1,8 +1,6 @@
-MD5 d89c16b4e592d7318756411f311a6410 mkxf86config-0.8-r1.ebuild 1005
-MD5 a648959775c674976dc86e3f47c268f1 ChangeLog 990
+MD5 65aca6b4942526165ee023b7e6fc43b5 mkxf86config-0.8-r2.ebuild 1004
+MD5 682625883e447d10d6d215529c2361eb ChangeLog 1228
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 f2acff84d872cd12cfa21cd36748977a mkxf86config-0.8.ebuild 889
 MD5 423b5bc3ee2b6cd634b09a3d671a9031 files/mkxf86config-init 117
-MD5 1b8398caeba504ebffc51674e3d8c18a files/digest-mkxf86config-0.8 74
-MD5 1b8398caeba504ebffc51674e3d8c18a files/digest-mkxf86config-0.8-r1 74
+MD5 acb082113f280286835527d735631bfd files/digest-mkxf86config-0.8-r2 74
 MD5 8ebdf9901bd2f9f2a5c4e4ccbfed541c files/mkxf86config-gentoo.patch 4040
diff --git a/x11-misc/mkxf86config/files/digest-mkxf86config-0.8 b/x11-misc/mkxf86config/files/digest-mkxf86config-0.8
deleted file mode 100644
index 829358e7f19a..000000000000
--- a/x11-misc/mkxf86config/files/digest-mkxf86config-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e29333c34ecff4bc459c8990acb5d934 xf86config-knoppix_0.8-2.tar.gz 9154
diff --git a/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r1 b/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r1
deleted file mode 100644
index 829358e7f19a..000000000000
--- a/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e29333c34ecff4bc459c8990acb5d934 xf86config-knoppix_0.8-2.tar.gz 9154
diff --git a/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r2 b/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r2
new file mode 100644
index 000000000000..5e89d3572f35
--- /dev/null
+++ b/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r2
@@ -0,0 +1 @@
+MD5 d29fb623c9c33ed3733ab949b4c5c001 xf86config-knoppix_0.8-5.tar.gz 9378
diff --git a/x11-misc/mkxf86config/mkxf86config-0.8-r1.ebuild b/x11-misc/mkxf86config/mkxf86config-0.8-r2.ebuild
index 895b7ee62538..9893aa238c8d 100644
--- a/x11-misc/mkxf86config/mkxf86config-0.8-r1.ebuild
+++ b/x11-misc/mkxf86config/mkxf86config-0.8-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.8-r1.ebuild,v 1.3 2004/04/27 20:46:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.8-r2.ebuild,v 1.1 2004/06/23 12:01:28 wolf31o2 Exp $
 
 inherit eutils
 
 IUSE="livecd"
 
 MY_PN="xf86config-knoppix"
-MY_PV="${PV}-2"
+MY_PV="${PV}-5"
 MY_P="${MY_PN}_${MY_PV}"
 S=${WORKDIR}/${MY_PN}-${PV}
 
diff --git a/x11-misc/mkxf86config/mkxf86config-0.8.ebuild b/x11-misc/mkxf86config/mkxf86config-0.8.ebuild
deleted file mode 100644
index 99945b3ce050..000000000000
--- a/x11-misc/mkxf86config/mkxf86config-0.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.8.ebuild,v 1.3 2004/04/27 20:46:47 agriffis Exp $
-
-inherit eutils
-
-IUSE=""
-
-MY_PN="xf86config-knoppix"
-MY_PV="${PV}-2"
-MY_P="${MY_PN}_${MY_PV}"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="xf86config setup program"
-SRC_URI="http://developer.linuxtag.net/knoppix/sources/${MY_P}.tar.gz"
-HOMEPAGE="http://www.knopper.net"
-
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=""
-RDEPEND="sys-apps/hwsetup
-	sys-apps/ddcxinfo-knoppix
-	virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PN}-gentoo.patch
-}
-
-src_install() {
-	dodoc debian/README.Debian debian/changelog debian/control debian/copyright
-	insinto /etc/X11
-	doins XF86Config-4.in XF86Config.in
-	exeinto /usr/sbin
-	doexe mkxf86config.sh
-}