From: Donnie Berkholz Date: Wed, 17 Nov 2004 17:43:07 +0000 (+0000) Subject: Remove ppc64-specific relinking for dlloader issues, because it's fixed in 6.8. Reque... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48835e3f6df30598770f3e307e308861d2b24845;p=gentoo.git Remove ppc64-specific relinking for dlloader issues, because it's fixed in 6.8. Requested by Markus Rothe . --- diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest index d535ad1465db..b57bcbf2c2a1 100644 --- a/x11-base/xfree/Manifest +++ b/x11-base/xfree/Manifest @@ -1,7 +1,7 @@ -MD5 12d9dd080702e8a794e7ec7cb0a3969a ChangeLog 80016 +MD5 36bc493a41d7bf7805b05d84607cf3a4 ChangeLog 80203 MD5 3f5571ecf7696e6901d5999a8473714c metadata.xml 226 MD5 fdaa915a186cfefacfc6f88dc0018ae8 xfree-4.3.0-r7.ebuild 35999 -MD5 7e3557c4d7059fa59dd08c49745b0fd9 xfree-4.3.0-r8.ebuild 36181 +MD5 b4a2c8c18e0ad4656cb29dbba86f2952 xfree-4.3.0-r8.ebuild 36043 MD5 530cb356359e8c56d0b9bb8801f793e8 files/digest-xfree-4.3.0-r7 2002 MD5 530cb356359e8c56d0b9bb8801f793e8 files/digest-xfree-4.3.0-r8 2002 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 8d745eaee450..60b2c63a3be0 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.206 2004/11/17 17:38:19 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.207 2004/11/17 17:43:07 spyderous Exp $ + + 17 Nov 2004; Donnie Berkholz ; + xorg-x11-6.8.0-r3.ebuild: + Remove ppc64-specific relinking for dlloader issues, because it's fixed in + 6.8. Requested by Markus Rothe . *xorg-x11-6.8.0-r3 (17 Nov 2004) diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index b7dfa67c0c81..e8a26656a746 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,10 +1,10 @@ MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086 MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340 -MD5 a93424ba5999133980d48e6c8fec4903 ChangeLog 46644 +MD5 db0488c78a0e949702d65485941ad273 ChangeLog 46860 MD5 cb102f4f4368c4b252805362396cde47 xorg-x11-6.8.0-r2.ebuild 50246 MD5 223a7a19eeeceddfe21fc50e9de60db1 xorg-x11-6.7.0-r3.ebuild 38098 -MD5 9bef0c6aab994b11595adbdc9ec5322c xorg-x11-6.8.0-r3.ebuild 41363 +MD5 36ab39a05061ae51a552083a2cfdc565 xorg-x11-6.8.0-r3.ebuild 39792 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild index 0a800c8c008a..9938ddd3641f 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.1 2004/11/17 17:38:19 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.2 2004/11/17 17:43:07 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -1342,44 +1342,9 @@ pkg_postinst() { chmod 1777 ${x} done - if use ppc64 - then - #The problem about display driver is fixed. - cd ${ROOT}/usr/X11R6/$(get_libdir)/modules/drivers - mv fbdev_drv.so fbdev_drv.so.orig - mv ati_drv.so ati_drv.so.orig - mv nv_drv.so nv_drv.so.orig - - ld -shared -o ${ROOT}/usr/X11R6/$(get_libdir)/modules/drivers/fbdev_drv.so ${ROOT}/usr/X11R6/$(get_libdir)/modules/drivers/fbdev_drv.so.orig ${ROOT}/usr/X11R6/$(get_libdir)/modules/linux/libfbdevhw.so ${ROOT}/usr/X11R6/$(get_libdir)/modules/libshadow.so ${ROOT}/usr/X11R6/$(get_libdir)/modules/libshadowfb.so ${ROOT}/usr/X11R6/$(get_libdir)/modules/libfb.so - ld -rpath ${ROOT}/usr/X11R6/$(get_libdir)/modules/drivers -shared -o ati_drv.so ati_drv.so.orig radeon_drv.so atimisc_drv.so fbdev_drv.so r128_drv.so vga_drv.so - ld -rpath ${ROOT}/usr/X11R6/$(get_libdir)/modules/drivers -shared -o nv_drv.so nv_drv.so.orig fbdev_drv.so vga_drv.so - - #The problem about DRI module and GLX module is fixed. - cd ${ROOT}/usr/X11R6/$(get_libdir)/modules/extensions - mv libglx.so libglx.so.orig - mv libdri.so libdri.so.orig - - ld -rpath ${ROOT}/usr/X11R6/$(get_libdir)/modules/extensions -shared -o libglx.so libglx.so.orig libGLcore.so - ld -rpath ${ROOT}/usr/X11R6/$(get_libdir)/modules/extensions -shared -o libdri.so libdri.so.orig libglx.so - fi - print_info } -pkg_prerm() { - - if use ppc64 - then - cd ${ROOT}/usr/X11R6/$(get_libdir)/modules/drivers - mv fbdev_drv.so.orig fbdev_drv.so - mv ati_drv.so.orig ati_drv.so - mv nv_drv.so.orig nv_drv.so - cd ${ROOT}/usr/X11R6/$(get_libdir)/modules/extensions - mv libglx.so.orig libglx.so - mv libdri.so.orig libdri.so - fi -} - pkg_postrm() { # Fix problematic links