Make the Gentoo patch work correctly with modular X, now that it is all stable.

Package-Manager: portage-2.1.1_pre3-r4

4 files changed, 32 insertions, 17 deletions

diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index 6841b443f113..fbab96804582 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hwsetup
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.42 2006/06/22 19:06:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.43 2006/07/25 19:16:07 wolf31o2 Exp $
+
+  25 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/hwsetup-1.1-gentoo.patch:
+  Make the Gentoo patch work correctly with modular X, now that it is all stable.
 
   22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.1.ebuild:
   Make RDEPEND use the DEPEND variable, instead of repeating its contents.
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index 9985e4749937..108cd9224c05 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -9,30 +9,30 @@ AUX hwsetup-1.1-fastprobe.patch 2802 RMD160 e35bccb86525b1fe52d12a8f5e88d797a875
 MD5 a01ba41c868d97350621a124fece8d25 files/hwsetup-1.1-fastprobe.patch 2802
 RMD160 e35bccb86525b1fe52d12a8f5e88d797a87589ca files/hwsetup-1.1-fastprobe.patch 2802
 SHA256 156cbb40ea082a573d6913b6a12481ccb1ec7f0afe4638b6e29bdbf33b1a2dc1 files/hwsetup-1.1-fastprobe.patch 2802
-AUX hwsetup-1.1-gentoo.patch 3866 RMD160 5c6ec749ec71d703c90ce3875449beded07e8a37 SHA1 db23124dd51626aa5c62e74ab0b5540eaeed1a4f SHA256 c9ac91fe6a4f0405a92d7f69f95d8af3d7d7aa17eac28aa248d73a44d85e2116
-MD5 22ac544b0b3754fbb82d5876dd339795 files/hwsetup-1.1-gentoo.patch 3866
-RMD160 5c6ec749ec71d703c90ce3875449beded07e8a37 files/hwsetup-1.1-gentoo.patch 3866
-SHA256 c9ac91fe6a4f0405a92d7f69f95d8af3d7d7aa17eac28aa248d73a44d85e2116 files/hwsetup-1.1-gentoo.patch 3866
-DIST hwsetup_1.1-1.tar.gz 9062
+AUX hwsetup-1.1-gentoo.patch 4249 RMD160 d2579ab52220879030408bfbbd8bf304c5650cdd SHA1 872d0e0d2ba0d2f60ca1b7084c6627d83393c2e8 SHA256 3e5531d98e293c8c2c0d0107f6bfdcd9fe8f503da83882b2ec8defe2d93ec4cd
+MD5 ad0bc16bdb6e632f71a2768e270c9372 files/hwsetup-1.1-gentoo.patch 4249
+RMD160 d2579ab52220879030408bfbbd8bf304c5650cdd files/hwsetup-1.1-gentoo.patch 4249
+SHA256 3e5531d98e293c8c2c0d0107f6bfdcd9fe8f503da83882b2ec8defe2d93ec4cd files/hwsetup-1.1-gentoo.patch 4249
+DIST hwsetup_1.1-1.tar.gz 9062 RMD160 e0728e9d79b83e815586c6af8e70baae0ac913c4 SHA1 b784b2ac947e2c98321875c83cb23fb2e3e8b342 SHA256 86fa767b6ceb74ce71fc6895e9db43445058025e4c0d6834a2c60159e3ea1199
 EBUILD hwsetup-1.1.ebuild 1301 RMD160 389a12c2a708e46983e589fb4a296f012fddf7e7 SHA1 3147e26b6e0943452a4167b4327a0f8a27865f13 SHA256 e15fa4feed51ca45a09327961159dd701ec4710e79ccf57c7c5d21909c4c7399
 MD5 f4c065fa81fc503dc09c2ae77242b8da hwsetup-1.1.ebuild 1301
 RMD160 389a12c2a708e46983e589fb4a296f012fddf7e7 hwsetup-1.1.ebuild 1301
 SHA256 e15fa4feed51ca45a09327961159dd701ec4710e79ccf57c7c5d21909c4c7399 hwsetup-1.1.ebuild 1301
-MISC ChangeLog 6380 RMD160 1cc84a78bacb3af98782b03bd9c7f41963c09035 SHA1 04580d06dd3cf0d347c9f07ce097721a15734d4c SHA256 cfba37893b73cce3c5f156aca41e013c2a79e74bee34417dd1ee8d741205367b
-MD5 e59bc6189018699ed65c3782b13aab61 ChangeLog 6380
-RMD160 1cc84a78bacb3af98782b03bd9c7f41963c09035 ChangeLog 6380
-SHA256 cfba37893b73cce3c5f156aca41e013c2a79e74bee34417dd1ee8d741205367b ChangeLog 6380
+MISC ChangeLog 6551 RMD160 eb8e2e1d0832d0bb93fc19eb313b01ff3b31ad0f SHA1 08625f384951b29123502d930b066563b6273feb SHA256 da94868c7c42835e39ec28038427f3eaab142fd139aaa4d154618e2161e9f21d
+MD5 d46cb4168abfb1eeb8a70bb2b90a49da ChangeLog 6551
+RMD160 eb8e2e1d0832d0bb93fc19eb313b01ff3b31ad0f ChangeLog 6551
+SHA256 da94868c7c42835e39ec28038427f3eaab142fd139aaa4d154618e2161e9f21d ChangeLog 6551
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
 SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d metadata.xml 159
-MD5 bc002ab4509c7c318c438f86d6005c71 files/digest-hwsetup-1.1 63
-RMD160 5acd6deb0b321f43a73af0931b25ad46e77e1826 files/digest-hwsetup-1.1 63
-SHA256 8968b4cce52fbfebc6f68ef9096671f7e5af03b806980679752982a2f24a55f5 files/digest-hwsetup-1.1 63
+MD5 dc992bac6f5f8dfb9dbb29a6543d072f files/digest-hwsetup-1.1 235
+RMD160 2a96256e2cb11c05b062b141c94ecbb07f56772a files/digest-hwsetup-1.1 235
+SHA256 95efc35c3ca6de4f79085ffa3e41c0bd9bc5498d2ebbdbe92423da33c56b06cf files/digest-hwsetup-1.1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmu1okT4lNIS36YERAkWoAJ9sNBHhstXjC/1NoqTLblQY1zBzjQCfc1pl
-OB9wzE19wo4RKiyGWRuvnLI=
-=765/
+iD8DBQFExm4LkT4lNIS36YERAvG3AKCMH8Y6JLjkH7HxxkLcQanONR7SUgCeJTHE
+9yy0BhT7z0mZipMDAk/mmsU=
+=SS0t
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwsetup/files/digest-hwsetup-1.1 b/sys-apps/hwsetup/files/digest-hwsetup-1.1
index 059534c1d49b..623696daacba 100644
--- a/sys-apps/hwsetup/files/digest-hwsetup-1.1
+++ b/sys-apps/hwsetup/files/digest-hwsetup-1.1
@@ -1 +1,3 @@
 MD5 da9be279ef57f697436fe37fbaa93976 hwsetup_1.1-1.tar.gz 9062
+RMD160 e0728e9d79b83e815586c6af8e70baae0ac913c4 hwsetup_1.1-1.tar.gz 9062
+SHA256 86fa767b6ceb74ce71fc6895e9db43445058025e4c0d6834a2c60159e3ea1199 hwsetup_1.1-1.tar.gz 9062
diff --git a/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch b/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch
index a91246b093ca..cff145434b78 100644
--- a/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch
+++ b/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch
@@ -13,7 +13,7 @@ diff -urN hwsetup-1.1.orig/hwsetup.c hwsetup-1.1/hwsetup.c
 -#define XPATH "/usr/X11R6/bin/"
 -#define XMODPATH "/usr/X11R6/lib/modules/drivers/"
 +#define XPATH "/usr/bin/"
-+#define XMODPATH "/usr/lib/modules/drivers/"
++#define XMODPATH "/usr/lib/xorg/modules/drivers/"
  
  #define VERBOSE_PRINT 1
 -#define VERBOSE_PROMPT 2
@@ -43,6 +43,15 @@ diff -urN hwsetup-1.1.orig/hwsetup.c hwsetup-1.1/hwsetup.c
     if(!strncasecmp(d->driver,"Card:",5)) /* RedHat Cards-DB */
      { /* Kudzu "Cards" format */
       FILE *cardsdb;
+@@ -255,7 +256,7 @@
+              char xmodule[32];
+              char fullpath[128];
+              sscanf(&buffer[7],"%31s",xmodule);
+-             sprintf(fullpath,XMODPATH"%.31s_drv.o",xmodule);
++             sprintf(fullpath,XMODPATH"%.31s_drv.so",xmodule);
+              if(exists(fullpath))
+               {
+                strncpy(xi.xmodule,xmodule,sizeof(xi.xmodule));
 @@ -279,9 +280,9 @@
           if(*xfree3server&&!*xi.xmodule)
             strncpy(xi.xserver,xfree3server,sizeof(xi.xserver));