removed pkg_prerm() and relink_dlloader_files()

Package-Manager: portage-2.0.51-r14

3 files changed, 11 insertions, 56 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index af8362004270..862e7b0e93e1 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.294 2005/01/22 02:21:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.295 2005/01/22 16:11:46 corsair Exp $
+
+  22 Jan 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.902.ebuild:
+  removed ppc64 specific functions pkg_prerm() and relink_dlloader_files() as
+  they are no longer needed
 
   21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 3ebb5ec39670..e72eac15921a 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,13 +1,13 @@
+MD5 4b05fd8eef701503365b49e4dc8989e3 ChangeLog 70832
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 18144c70fc45fb00838c406ad9689dc0 ChangeLog 70651
-MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453
-MD5 c0f8e417ca09b7e0a6cb0df5345c9ade xorg-x11-6.8.0-r4.ebuild 52258
+MD5 1cdb4c00d2f3aedc8340b0a29c16c291 xorg-x11-6.8.1.902.ebuild 50582
 MD5 a8051c491706514a17657504c7d5ba69 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
-MD5 a7ce9c9d294dafe0a22e21eb576a0d23 xorg-x11-6.8.1.902.ebuild 52264
-MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
+MD5 c0f8e417ca09b7e0a6cb0df5345c9ade xorg-x11-6.8.0-r4.ebuild 52258
+MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
 MD5 fa94b81b33045020143c8d9ded15a3ac files/digest-xorg-x11-6.8.0-r4 911
+MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
 MD5 31a8fa39480a7053afd4ebd7493c09c4 files/digest-xorg-x11-6.8.1.901-r1 517
 MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902 517
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
index 6c8b91137a6e..3b876cbaad13 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1.902.ebuild,v 1.18 2005/01/22 02:21:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.19 2005/01/22 16:11:46 corsair Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -448,20 +448,9 @@ pkg_postinst() {
 		chmod 1777 ${x}
 	done
 
-	if use ppc64; then
-		relink_dlloader_files
-	fi
-
 	print_info
 }
 
-pkg_prerm() {
-
-	if use ppc64; then
-		restore_original_dlloader_files
-	fi
-}
-
 pkg_postrm() {
 
 	# Fix problematic links
@@ -1624,28 +1613,6 @@ remove_old_compose_files() {
 	done
 }
 
-relink_dlloader_files() {
-	#The problem about display driver is fixed.
-	cd ${ROOT}/usr/$(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/$(get_libdir)/modules/drivers/fbdev_drv.so ${ROOT}/usr/$(get_libdir)/modules/drivers/fbdev_drv.so.orig ${ROOT}/usr/$(get_libdir)/modules/linux/libfbdevhw.so ${ROOT}/usr/$(get_libdir)/modules/libshadow.so ${ROOT}/usr/$(get_libdir)/modules/libshadowfb.so ${ROOT}/usr/$(get_libdir)/modules/libfb.so
-	ld -rpath /usr/$(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 /usr/$(get_libdir)/modules/drivers -shared -o nv_drv.so nv_drv.so.orig fbdev_drv.so vga_drv.so
-
-	if use opengl; then
-		#The problem about DRI module and GLX module is fixed.
-		cd ${ROOT}/usr/$(get_libdir)/modules/extensions
-		mv libglx.so libglx.so.orig
-		mv libdri.so libdri.so.orig
-
-		ld -rpath /usr/$(get_libdir)/modules/extensions -shared -o libglx.so libglx.so.orig libGLcore.so
-		ld -rpath /usr/$(get_libdir)/modules/extensions -shared -o libdri.so libdri.so.orig libglx.so
-	fi
-}
-
 print_info() {
 	echo
 	einfo "Please note that the xcursors are in /usr/share/cursors/${PN}"
@@ -1675,19 +1642,3 @@ print_info() {
 	ebeep 5
 	epause 10
 }
-
-###############
-# pkg_prerm() #
-###############
-
-restore_original_dlloader_files() {
-		cd ${ROOT}/usr/$(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/$(get_libdir)/modules/extensions
-		if use opengl; then
-			mv libglx.so.orig libglx.so
-			mv libdri.so.orig libdri.so
-		fi
-}