Look for /etc/X11/xorg.conf (#47632).

5 files changed, 113 insertions, 16 deletions

diff --git a/media-video/yanc/ChangeLog b/media-video/yanc/ChangeLog
index a8abcab3dbbe..d540e00baba4 100644
--- a/media-video/yanc/ChangeLog
+++ b/media-video/yanc/ChangeLog
@@ -1,19 +1,10 @@
 # ChangeLog for media-video/yanc
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/ChangeLog,v 1.3 2004/04/21 15:46:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/ChangeLog,v 1.4 2004/06/14 00:37:35 spyderous Exp $
 
-  21 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; yanc-0.2.0.ebuild,
-  yanc-0.2.1.ebuild:
-  Change x11-base/xfree dependency to virtual/x11.
+*yanc-0.2.1-r1 (13 Jun 2004)
 
-*yanc-0.2.1 (12 Oct 2003)
-
-  12 Oct 2003; Bart Lauwers <blauwers@gentoo.org> :
-  Version bump.
-
-*yanc-0.2.0 (14 Jun 2003)
-
-  14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> yanc-0.2.0.ebuild:
-  Yet Another Nv Configurator. Ebuild submission by: Baptiste SIMON
-  <beta@e-glop.net> in bug #14226
+  13 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/yanc-0.2.1-xorg-x11-compat.patch, +yanc-0.2.1-r1.ebuild:
+  Look for /etc/X11/xorg.conf (#47632).
 
diff --git a/media-video/yanc/Manifest b/media-video/yanc/Manifest
index 8554b435ff7d..c390030eaff1 100644
--- a/media-video/yanc/Manifest
+++ b/media-video/yanc/Manifest
@@ -1,5 +1,8 @@
-MD5 44f3ac2ed225c283d212b3e8157ff77c ChangeLog 661
+MD5 deb074907a0fd9539dd5e0e952ca9b6d ChangeLog 408
 MD5 879c97eb7f0d4f941d5946f5a32a6f38 yanc-0.2.0.ebuild 1427
-MD5 1b27f7778c856d215afdab0fd8837573 yanc-0.2.1.ebuild 1424
+MD5 b1bdbdf473d51215a9b028466db6f176 yanc-0.2.1-r1.ebuild 1506
+MD5 76c57bc32021e37468eb229da1c22b09 yanc-0.2.1.ebuild 1423
 MD5 47b5f3091491bba33f121b7ffe96eb43 files/digest-yanc-0.2.0 63
 MD5 86918baa28386ca82bfb73e27ba42651 files/digest-yanc-0.2.1 63
+MD5 beb2a52f3d303ba15086a907bf941abd files/yanc-0.2.1-xorg-x11-compat.patch 1669
+MD5 86918baa28386ca82bfb73e27ba42651 files/digest-yanc-0.2.1-r1 63
diff --git a/media-video/yanc/files/digest-yanc-0.2.1-r1 b/media-video/yanc/files/digest-yanc-0.2.1-r1
new file mode 100644
index 000000000000..4bade074223c
--- /dev/null
+++ b/media-video/yanc/files/digest-yanc-0.2.1-r1
@@ -0,0 +1 @@
+MD5 90ac4769a223694d86863a9d4ad57206 yanc-0.2.1.tar.gz 3625597
diff --git a/media-video/yanc/files/yanc-0.2.1-xorg-x11-compat.patch b/media-video/yanc/files/yanc-0.2.1-xorg-x11-compat.patch
new file mode 100644
index 000000000000..c184e18f280e
--- /dev/null
+++ b/media-video/yanc/files/yanc-0.2.1-xorg-x11-compat.patch
@@ -0,0 +1,42 @@
+diff -urN yanc-0.2.1.orig/src/Unit1.pas yanc-0.2.1/src/Unit1.pas
+--- yanc-0.2.1.orig/src/Unit1.pas	2004-06-13 20:26:47.000000000 -0400
++++ yanc-0.2.1/src/Unit1.pas	2004-06-13 20:28:34.000000000 -0400
+@@ -891,21 +891,26 @@
+ if (dateiname_xf86config='') then
+ begin
+ 
+-  if FileExists('/etc/X11/XF86Config') then
++  if FileExists('/etc/X11/xorg.conf') then
+     begin
+       inc(anzahl_xf86configs);
+-      dateiname_xf86config:='/etc/X11/XF86Config';
++      dateiname_xf86config:='/etc/X11/xorg.conf';
+     end;
+-          if FileExists('/etc/X11/XF86Config-4') then
+-            begin
+-              inc(anzahl_xf86configs);
+-              dateiname_xf86config:='/etc/X11/XF86Config-4';
+-            end;
+-                    if FileExists('/etc/XF86Config-4') then
+-                      begin
+-                      inc(anzahl_xf86configs);
+-                      dateiname_xf86config:='/etc/XF86Config-4';
+-                      end;
++        if FileExists('/etc/X11/XF86Config') then
++          begin
++            inc(anzahl_xf86configs);
++            dateiname_xf86config:='/etc/X11/XF86Config';
++          end;
++                if FileExists('/etc/X11/XF86Config-4') then
++                  begin
++                    inc(anzahl_xf86configs);
++                    dateiname_xf86config:='/etc/X11/XF86Config-4';
++                  end;
++                          if FileExists('/etc/XF86Config-4') then
++                            begin
++                              inc(anzahl_xf86configs);
++                              dateiname_xf86config:='/etc/XF86Config-4';
++                            end;
+ end;
+                       
+ if (anzahl_xf86configs>1) then
diff --git a/media-video/yanc/yanc-0.2.1-r1.ebuild b/media-video/yanc/yanc-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..333609d75e5f
--- /dev/null
+++ b/media-video/yanc/yanc-0.2.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/yanc-0.2.1-r1.ebuild,v 1.1 2004/06/14 00:37:35 spyderous Exp $
+
+inherit eutils
+
+DESCRIPTION="YanC is a GUI configuration tool for the NVIDIA Accelerated Linux Driver Set."
+HOMEPAGE="http://yanc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/yanc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+# As the downloaded package seems to be pre-compiled,
+# the dependances are not clear.
+# TODO: Emerge the real compilable yanc's code
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-xorg-x11-compat.patch
+}
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	dodir /usr/share/yanc
+	dodir /usr/lib
+	dodir /usr/bin
+
+	cp -r src ${D}/usr/share/yanc
+	cp -r lang ${D}/usr/share/yanc
+	dolib lib/libborqt-6.9.0-qt2.3.so
+	dosym libborqt-6.9.0-qt2.3.so /usr/lib/libborqt-6.9-qt2.3.so
+
+	insinto /usr/share/yanc
+	doins logo.jpg gpl.jpg loeschen.xpm nachunten.xpm nachoben.xpm yanc.xpm
+	doins LICENSE
+
+	exeinto /usr/share/yanc
+	doexe yanc
+
+
+	into /usr
+	dobin script/yanc
+	dosed "s:local:share:" /usr/bin/yanc
+
+	dodoc README*
+	dohtml doc
+}
+
+pkg_postinst() {
+	einfo '-> Please create a copy of your X config before you use YanC for the'
+	einfo 'first time, because it is possible that it will be damaged because of'
+	einfo 'the use of YanC. Then a restart of X would be impossible.'
+}