Version bumped

(Portage version: 2.0.51-r15)

5 files changed, 278 insertions, 4 deletions

diff --git a/x11-misc/Xautoconfig/ChangeLog b/x11-misc/Xautoconfig/ChangeLog
index e4cb169dfbb3..a767ee070a6d 100644
--- a/x11-misc/Xautoconfig/ChangeLog
+++ b/x11-misc/Xautoconfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/Xautoconfig
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/Xautoconfig/ChangeLog,v 1.15 2005/01/02 15:06:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/Xautoconfig/ChangeLog,v 1.16 2005/02/21 12:28:24 dholm Exp $
+
+*Xautoconfig-0.23 (21 Feb 2005)
+
+  21 Feb 2005; David Holm <dholm@gentoo.org>
+  +files/Xautoconfig-0.23-gentoo.patch, +Xautoconfig-0.23.ebuild:
+  Version bumped
 
   02 Jan 2005; Markus Rothe <corsair@gentoo.org> Xautoconfig-0.22-r2.ebuild:
   Added ~ppc64 to KEYWORDS; credits go to Alex Polvi <polvi@gentoo.org>; bug
diff --git a/x11-misc/Xautoconfig/Manifest b/x11-misc/Xautoconfig/Manifest
index 5e76f66adaa3..69cbdf8fa5ab 100644
--- a/x11-misc/Xautoconfig/Manifest
+++ b/x11-misc/Xautoconfig/Manifest
@@ -1,8 +1,11 @@
-MD5 aca5c60bef9a37d94a477033b94422cc ChangeLog 1687
+MD5 10c09e86d78c6fcf2a774ad1da8f63ac ChangeLog 1849
 MD5 a5e4d22d654e362eb52ed599cc15227f Xautoconfig-0.15.ebuild 953
-MD5 0607eb34ec70ef290ca09345332761b2 Xautoconfig-0.22-r2.ebuild 939
 MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
+MD5 0607eb34ec70ef290ca09345332761b2 Xautoconfig-0.22-r2.ebuild 939
+MD5 0aa9b3725837bb38e3057c0d6d74286f Xautoconfig-0.23.ebuild 798
+MD5 d2e645a38c207a626b6b6fb2c9835937 files/digest-Xautoconfig-0.15 67
 MD5 84488d6200d40958f780a49b6203c1e7 files/XF4text.h.diff 1937
 MD5 7e31919322ee6a5e01fa56b44fc46338 files/Xautoconfig.patch 3867
-MD5 d2e645a38c207a626b6b6fb2c9835937 files/digest-Xautoconfig-0.15 67
 MD5 7d6fd7123b65ab448c23cdbed3c33c1b files/digest-Xautoconfig-0.22-r2 67
+MD5 5373a5ee321626f0b02ca374d86cc486 files/Xautoconfig-0.23-gentoo.patch 6565
+MD5 bdc69452e10bd8b7bf9e7a827d338a2d files/digest-Xautoconfig-0.23 67
diff --git a/x11-misc/Xautoconfig/Xautoconfig-0.23.ebuild b/x11-misc/Xautoconfig/Xautoconfig-0.23.ebuild
new file mode 100644
index 000000000000..0cffa687b2c1
--- /dev/null
+++ b/x11-misc/Xautoconfig/Xautoconfig-0.23.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/Xautoconfig/Xautoconfig-0.23.ebuild,v 1.1 2005/02/21 12:28:24 dholm Exp $
+
+inherit eutils
+
+DESCRIPTION="Xautoconfig is a PPC only config file generator for xfree86"
+SRC_URI="http://ftp.penguinppc.org/projects/xautocfg/${P}.tar.gz"
+HOMEPAGE="http://ftp.penguinppc.org/projects/xautocfg/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc ~ppc64"
+IUSE=""
+
+DEPEND="sys-apps/pciutils"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch || die
+}
+
+src_compile() {
+	make || die "sorry, failed to compile Xautoconfig (PPC-only ebuild)"
+}
+
+src_install() {
+	dodir /usr/X11R6/
+	into /usr/X11R6/
+	dobin Xautoconfig
+
+	dodoc ChangeLog
+
+}
diff --git a/x11-misc/Xautoconfig/files/Xautoconfig-0.23-gentoo.patch b/x11-misc/Xautoconfig/files/Xautoconfig-0.23-gentoo.patch
new file mode 100644
index 000000000000..05f30360c3f9
--- /dev/null
+++ b/x11-misc/Xautoconfig/files/Xautoconfig-0.23-gentoo.patch
@@ -0,0 +1,230 @@
+diff -Naur Xautoconfig-0.23.orig/XF4text.h Xautoconfig-0.23/XF4text.h
+--- Xautoconfig-0.23.orig/XF4text.h	2005-02-21 13:12:31.036404520 +0100
++++ Xautoconfig-0.23/XF4text.h	2005-02-21 13:12:49.315625656 +0100
+@@ -1,4 +1,6 @@
+-/* This file hold the various bits of the config file for XFree86 4.2+ */
++/* This file hold the various bits of the config file for X.org >=6.7.0 */
++
++/* Modified for Gentoo PPC Distribution by Matt Jarjoura and Lars Weiler */
+ 
+ static char *header =
+ "# File generated by Xautoconfig.\n"
+@@ -20,10 +22,26 @@
+ "\n"
+ "       RgbPath      \"/usr/X11R6/lib/X11/rgb\"\n";
+ 
+-static char *fontpath =
+-"       FontPath     \"unix/:7100\"\n"
++static char *fontpath_gentoo = 
++"    # For XFS, uncomment this and comment the others\n"
++"    # FontPath    \"unix/:-1\"\n"
++"    FontPath    \"/usr/share/fonts/local/\"\n"
++"    FontPath    \"/usr/share/fonts/misc/\"\n"
++"    FontPath    \"/usr/share/fonts/75dpi/:unscaled\"\n"
++"    FontPath    \"/usr/share/fonts/100dpi/:unscaled\"\n"
++"    FontPath    \"/usr/share/fonts/Type1/\"\n"
++"    FontPath    \"/usr/share/fonts/TTF/\"\n"
++"    FontPath    \"/usr/share/fonts/CID/\"\n"
++"    FontPath    \"/usr/share/fonts/Speedo/\"\n"
++"    FontPath    \"/usr/share/fonts/75dpi/\"\n"
++"    FontPath    \"/usr/share/fonts/100dpi/\"\n"
+ "EndSection\n\n";
+ 
++/* static char *fontpath =
++"       FontPath     \"unix/:7100\"\n"
++"EndSection\n\n";
++*/
++ 
+ static char *fontpath_anaconda =
+ "       FontPath    \"/usr/X11R6/lib/X11/fonts/misc:unscaled\"\n"
+ "       FontPath    \"/usr/X11R6/lib/X11/fonts/Type1/\"\n"
+@@ -57,13 +75,12 @@
+ static char *inputdev_section =
+ "Section \"InputDevice\"\n"
+ "	Identifier	\"Keyboard0\"\n"
+-"	Driver		\"keyboard\"\n";
++"	Driver		\"kbd\"\n";
+ 
+ static char *keyboard_linux =
+ "# Change \"XkbModel\" to \"macintosh_old\" if you are using\n"
+ "# the deprecated adb keycodes.\n"
+-"	Option		\"XkbRules\"	\"xfree86\"\n"
+-"	Option		\"XkbModel\"	\"macintosh\"\n"
++"	Option		\"XkbModel\"	\"pc104\"\n"
+ "	Option		\"XkbLayout\"	\"us\"\n"
+ "EndSection\n\n";
+ 
+diff -Naur Xautoconfig-0.23.orig/Xautoconfig.c Xautoconfig-0.23/Xautoconfig.c
+--- Xautoconfig-0.23.orig/Xautoconfig.c	2005-02-21 13:12:31.036404520 +0100
++++ Xautoconfig-0.23/Xautoconfig.c	2005-02-21 13:14:02.989425536 +0100
+@@ -1,5 +1,6 @@
+-/* Xautoconfig: versatile XF86Config creation tool for powerpc
++/* Xautoconfig: versatile XF86Config/xorg.conf creation tool for powerpc
+  *
++ * Copyright (C) 2004 Matt Jarjoura <matt@tasonline.com>
+  * Copyright (C) 2002-2004 Dan Burcaw <dan@ydl.net>
+  * Copyright (C) 1999-2001 Tom Rini <trini@kernel.crashing.org>
+  *
+@@ -33,6 +34,8 @@
+ extern void usage();
+ extern char * macMachineType(void);
+ 
++char XorgTest(void);
++
+ struct monitor_sync
+ {
+ 	int h_min;
+@@ -41,6 +44,21 @@
+ 	int v_max;
+ };
+ 
++/* Gentoo Likes Color, so I decided to add some to this tiny utility
++  since this is a gentoo specific application */
++
++#define GENTOO_COLOR
++  
++#ifdef GENTOO_COLOR
++  #define GENTOO_BOLD  "\x1b[01m"
++  #define GENTOO_RESET "\x1b[0m"
++  #define GENTOO_RED   "\x1b[31;06m"
++#else
++  #define GENTOO_BOLD  ""
++  #define GENTOO_RESET ""
++  #define GENTOO_RED   ""
++#endif
++
+ int main(int argc, char **argv) {
+ 	FILE * f;
+ 	int i, depth, fd;
+@@ -51,6 +69,8 @@
+ 	unsigned int htotal, vtotal;
+ 	char manufacturer[4];
+ 
++	char xorg = 0;
++	
+ 	struct monitor_sync sync;
+ 	struct fb_fix_screeninfo fix;
+ 	struct fb_var_screeninfo var;
+@@ -79,8 +99,11 @@
+ 		var.yres = 600;
+ 	}
+ 
++	printf("%sXautoconfig: Release 0.23.[Gentoo] %s\n\n", GENTOO_BOLD, GENTOO_RESET);
++	
+ 	if (rc) {
+-		fprintf(stderr, "Can't access %s. Exiting.\n", name);
++		fprintf(stderr, "%sCan't access %s. Exiting.%s\n", 
++				GENTOO_RED, name, GENTOO_RESET);
+ 		return -1;
+ 	}
+ 
+@@ -205,18 +228,48 @@
+ 			return -1;;
+ 		}
+ 	} else {
+-		/* Let's be nice and backup an existing XF86Config */
+-		if ((f = fopen("/etc/X11/XF86Config", "r"))) {
+-		       system("mv /etc/X11/XF86Config /etc/X11/XF86Config.xautoconfig");
++		
++		/* Test to see if it's xorg or XFree86 */
++		if (XorgTest())
++		{
++			xorg = 0;  /* false, using XF86Config */
++			
++			/* Let's be nice and backup an existing XF86Config */
++			if ((f = fopen("/etc/X11/XF86Config", "r"))) 
++			{
++				fclose(f);
++		       		printf("XF86Config found, moving to XF86Config.orig...\n");
++				system("mv /etc/X11/XF86Config /etc/X11/XF86Config.orig");
++			}
++
++			if (!(f = fopen("/etc/X11/XF86Config", "w"))) 
++			{
++				fprintf(stderr, "%sCan't write to /etc/X11/XF86Config. Exiting.%s\n",
++				GENTOO_RED, GENTOO_RESET);
++				return -1;
++			}
+ 		}
++		else
++		{
++			xorg = 1;  /* true, using xorg.conf */
++		
++			/* Let's be nice and backup an existing XF86Config */
++			if ((f = fopen("/etc/X11/xorg.conf", "r"))) 
++			{
++				fclose(f);
++				printf("xorg.conf found, moving to xorg.conf.orig...\n");
++				system("mv /etc/X11/xorg.conf /etc/X11/xorg.conf.orig");
++			}
+ 
+-		if (!(f = fopen("/etc/X11/XF86Config", "w"))) {
+-			fprintf(stderr, "Can't write to /etc/X11/XF86Config. Exiting.\n");
+-			return -1;;
++			if (!(f = fopen("/etc/X11/xorg.conf", "w"))) 
++			{
++				fprintf(stderr, "%sCan't write to /etc/X11/xorg.conf. Exiting.%s\n",
++				GENTOO_RED, GENTOO_RESET);
++				return -1;
++			}			
+ 		}
+ 	}
+ 
+-
+ 	/*** BEGIN XF86Config ***/
+ 	fprintf(f, "%s", header);
+ 
+@@ -224,7 +277,7 @@
+ 	if (anaconda)
+ 		fprintf(f, "%s", fontpath_anaconda);
+ 	else
+-		fprintf(f, "%s", fontpath);
++		fprintf(f, "%s", fontpath_gentoo);
+ 
+ 	/* modules section */
+ 	fprintf(f, "%s", modules_section);
+@@ -362,6 +415,7 @@
+ 			/* ATI Radeon */
+ 			case 38:
+ 				fprintf(f, "%s", driver_on_opts);
++				fprintf(f, "	Option  \"EnablePageFlip\"\n");
+ 				fprintf(f, "	Driver	\"radeon\"\n");
+ 				break;
+ 			default:
+@@ -369,6 +423,7 @@
+ 				if ((!strncmp(fix.id, "ATI Radeon", 10)) &&
+ 				   (strncmp(fix.id, "ATI Radeon VE", 13))) { 
+ 					fprintf(f, "%s", driver_on_opts);
++					fprintf(f, "	Option  \"EnablePageFlip\"\n");
+ 					fprintf(f, "	Driver	\"radeon\"\n");
+ 				} else if (!strncmp(fix.id, "Rage128", 7)) {
+ 					fprintf(f, "%s", driver_on_opts);
+@@ -431,7 +486,26 @@
+ 	if (anaconda)
+ 		fprintf(stdout, "Wrote /tmp/XF86Config.test\n");
+ 	else
+-		fprintf(stdout, "Wrote /etc/X11/XF86Config\n");
+-
++	{	
++		if (xorg)
++			fprintf(stdout, "Wrote /etc/X11/xorg.conf %s\n", GENTOO_RESET);
++		else
++			fprintf(stdout, "Wrote /etc/X11/XF86Config %s\n", GENTOO_RESET);
++	}
++		
+ 	return 0;
+ }
++
++/**
++ * @return char  true if running X.org, false XFree86 
++ */
++char XorgTest(void)
++{
++	FILE *f;
++	
++	if (!(f = fopen("/usr/X11R6/bin/Xorg", "r")))
++		return -1;
++	else
++		return 0;
++}
++
diff --git a/x11-misc/Xautoconfig/files/digest-Xautoconfig-0.23 b/x11-misc/Xautoconfig/files/digest-Xautoconfig-0.23
new file mode 100644
index 000000000000..ef81eeea4c55
--- /dev/null
+++ b/x11-misc/Xautoconfig/files/digest-Xautoconfig-0.23
@@ -0,0 +1 @@
+MD5 d07fff071908c7cef915c10a1af468aa Xautoconfig-0.23.tar.gz 52642