Functionalize pkg_preinst(), pkg_postinst(), pkg_postrm().

Package-Manager: portage-2.0.51-r14

3 files changed, 61 insertions, 48 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 82b36742fcf1..3336de08b6cb 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.299 2005/01/24 09:15:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.300 2005/01/24 09:21:04 spyderous Exp $
+
+  24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild:
+  Functionalize pkg_preinst(), pkg_postinst(), pkg_postrm().
 
   24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.1.902-r1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 9bd6cf49bf30..d81fbe65ce75 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,11 +1,11 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 8eaadb62ede7fd59ec66945484ed3466 ChangeLog 71487
+MD5 49610774bbd2cf01d879c5a16668ec65 ChangeLog 71636
 MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453
 MD5 c0f8e417ca09b7e0a6cb0df5345c9ade xorg-x11-6.8.0-r4.ebuild 52258
 MD5 a8051c491706514a17657504c7d5ba69 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
 MD5 c0011ac3fb628157bb67f054e73b0483 xorg-x11-6.8.1.902.ebuild 50159
-MD5 06708d289c7a66a93262faebf8954e86 xorg-x11-6.8.1.902-r1.ebuild 50388
+MD5 e7f9f91080e4dd44b88909bb80322c4f xorg-x11-6.8.1.902-r1.ebuild 50488
 MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild
index 962dd0fed2a8..0e3cbbf1debe 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.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-r1.ebuild,v 1.2 2005/01/24 09:15:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild,v 1.3 2005/01/24 09:21:04 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -283,25 +283,7 @@ pkg_preinst() {
 
 	update_config_files
 
-	for G_FONTDIR in ${G_FONTDIRS}; do
-		# Get rid of deprecated directories so our symlinks in the same location
-		# work -- users shouldn't be placing fonts here so that should be fine,
-		# they should be using ~/.fonts or /usr/share/fonts. <spyderous>
-		remove_font_dirs
-
-		# clean out old fonts.* and encodings.dir files, as we
-		# will regenerate them
-		# Not Speedo or CID, as their fonts.scale files are "real"
-		if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ]; then
-			find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
-				-o -name 'encodings.dir' -exec rm -f {} \;
-		fi
-	done
-
-	# No longer used by xorg-x11
-	if [ -d ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/truetype ]; then
-		rm -rf ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/truetype
-	fi
+	cleanup_fonts
 
 	move_app_defaults_to_etc
 
@@ -313,14 +295,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-
-	local x=""
-
 	env-update
 
 	if [ "${ROOT}" = "/" ]; then
-		umask 022
-
 		font_setup
 
 		if use opengl; then
@@ -330,31 +307,13 @@ pkg_postinst() {
 
 	remove_old_compose_files
 
-	# These need to be owned by root and the correct permissions
-	# (bug #8281)
-	for x in ${ROOT}/tmp/.{ICE,X11}-unix; do
-		if [ ! -d ${x} ]; then
-			mkdir -p ${x}
-		fi
-
-		chown root:root ${x}
-		chmod 1777 ${x}
-	done
+	setup_tmp_files
 
 	print_info
 }
 
 pkg_postrm() {
-
-	# Fix problematic links
-	if [ -x ${ROOT}/usr/X11R6/bin/Xorg ]; then
-		ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11
-		ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-		ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS
-		if use opengl; then
-			ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
-		fi
-	fi
+	fix_links
 }
 
 ###############
@@ -1408,6 +1367,28 @@ update_config_files() {
 	fi
 }
 
+cleanup_fonts() {
+	for G_FONTDIR in ${G_FONTDIRS}; do
+		# Get rid of deprecated directories so our symlinks in the same location
+		# work -- users shouldn't be placing fonts here so that should be fine,
+		# they should be using ~/.fonts or /usr/share/fonts. <spyderous>
+		remove_font_dirs
+
+		# clean out old fonts.* and encodings.dir files, as we
+		# will regenerate them
+		# Not Speedo or CID, as their fonts.scale files are "real"
+		if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ]; then
+			find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
+				-o -name 'encodings.dir' -exec rm -f {} \;
+		fi
+	done
+
+	# No longer used by xorg-x11
+	if [ -d ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/truetype ]; then
+		rm -rf ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/truetype
+	fi
+}
+
 remove_font_dirs() {
 		if [ -d ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/${G_FONTDIR} ]; then
 			# local directory is for sysadmin-added fonts, so save it
@@ -1471,6 +1452,8 @@ clean_dynamic_libgl() {
 ##################
 
 font_setup() {
+	umask 022
+
 	# These cause ttmkfdir to segfault :/
 	rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.8x.enc.gz
 	rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.16.enc.gz
@@ -1612,6 +1595,20 @@ remove_old_compose_files() {
 	done
 }
 
+setup_tmp_files() {
+	# These need to be owned by root and the correct permissions
+	# (bug #8281)
+	local x=""
+	for x in ${ROOT}/tmp/.{ICE,X11}-unix; do
+		if [ ! -d ${x} ]; then
+			mkdir -p ${x}
+		fi
+
+		chown root:root ${x}
+		chmod 1777 ${x}
+	done
+}
+
 print_info() {
 	echo
 	einfo "Please note that the xcursors are in /usr/share/cursors/${PN}"
@@ -1641,3 +1638,15 @@ print_info() {
 	ebeep 5
 	epause 10
 }
+
+fix_links() {
+	# Fix problematic links
+	if [ -x ${ROOT}/usr/X11R6/bin/Xorg ]; then
+		ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11
+		ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
+		ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS
+		if use opengl; then
+			ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
+		fi
+	fi
+}