From 9f5cf622605d081d2ffd4f2ade0d69c0c463a108 Mon Sep 17 00:00:00 2001
From: Alexandre Buisse <nattfodd@gentoo.org>
Date: Sun, 26 Mar 2006 13:56:30 +0000
Subject: Install doc in /usr/share/doc instead of /usr/doc (Portage version:
 2.1_pre6-r5)

---
 app-text/sgml-common/ChangeLog                     |  12 +-
 app-text/sgml-common/Manifest                      |  40 ++---
 .../sgml-common/files/digest-sgml-common-0.6.3-r4  |   2 +
 .../sgml-common/files/digest-sgml-common-0.6.3-r5  |   3 +
 .../files/sgml-common-0.6.3-configure.in.patch     |  13 ++
 .../files/sgml-common-0.6.3-install-catalog.in     | 180 +++++++++++++++++++++
 .../files/sgml-common-0.6.3-r4-install-catalog.in  | 180 ---------------------
 app-text/sgml-common/sgml-common-0.6.3-r4.ebuild   |   4 +-
 app-text/sgml-common/sgml-common-0.6.3-r5.ebuild   |  80 +++++++++
 9 files changed, 312 insertions(+), 202 deletions(-)
 create mode 100644 app-text/sgml-common/files/digest-sgml-common-0.6.3-r5
 create mode 100644 app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch
 create mode 100644 app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in
 delete mode 100644 app-text/sgml-common/files/sgml-common-0.6.3-r4-install-catalog.in
 create mode 100644 app-text/sgml-common/sgml-common-0.6.3-r5.ebuild

(limited to 'app-text')

diff --git a/app-text/sgml-common/ChangeLog b/app-text/sgml-common/ChangeLog
index fe3bee9066f2..d092dcc23096 100644
--- a/app-text/sgml-common/ChangeLog
+++ b/app-text/sgml-common/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/sgml-common
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.32 2006/01/14 14:02:33 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.33 2006/03/26 13:56:30 nattfodd Exp $
+
+*sgml-common-0.6.3-r5 (26 Mar 2006)
+
+  26 Mar 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +files/sgml-common-0.6.3-configure.in.patch,
+  +files/sgml-common-0.6.3-install-catalog.in,
+  -files/sgml-common-0.6.3-r4-install-catalog.in,
+  sgml-common-0.6.3-r4.ebuild, +sgml-common-0.6.3-r5.ebuild:
+  Install doc in /usr/share/doc instead of /usr/doc. Thanks to Andrew
+  Kirilenko for the report and Christan Heim for the patch.
 
   14 Jan 2006; Leonardo Boshell <leonardop@gentoo.org>
   files/sgml-common-0.6.3-r4-install-catalog.in,
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index bd1f120012fe..2804ec170cb3 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,25 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2bd03283da58b3dba8109de1ce946ef4 ChangeLog 4588
 RMD160 41500bb71a0ef524a274959f8acb3efde4ca46b8 ChangeLog 4588
 SHA256 336185fc1195e02b634b88c91a4cc4c188c5fb737a77aeb25c1a62060421d5c7 ChangeLog 4588
-MD5 80a892383a2ec3e9e4b4efe8868b6db0 files/digest-sgml-common-0.6.3-r4 65
-RMD160 a2d24506806f0cc98aaf012a965224e57cc461eb files/digest-sgml-common-0.6.3-r4 65
-SHA256 0f9202c362d354b643a5a46d39a471ca5021c96d3aa3fc5d7f9b69970d91081f files/digest-sgml-common-0.6.3-r4 65
-MD5 d54c8e50cf0f9e8fc72433ca67cd848a files/sgml-common-0.6.3-r4-install-catalog.in 4917
-RMD160 f4c330fbea31c09201f5c75cbf6e85e894327ebd files/sgml-common-0.6.3-r4-install-catalog.in 4917
-SHA256 71db2836b286741b853897d040c22b9e632097c0039be32dc98fd0a83297b654 files/sgml-common-0.6.3-r4-install-catalog.in 4917
+MD5 ed80d3150b7151b2db464cac2220e87b files/digest-sgml-common-0.6.3-r4 241
+RMD160 31bebdffb57759155f94d90653e17956f8e30654 files/digest-sgml-common-0.6.3-r4 241
+SHA256 32c78d10e852b45bba816c390d7ed87d87754ca91cad13a2946f717a6c22daca files/digest-sgml-common-0.6.3-r4 241
+MD5 ed80d3150b7151b2db464cac2220e87b files/digest-sgml-common-0.6.3-r5 241
+RMD160 31bebdffb57759155f94d90653e17956f8e30654 files/digest-sgml-common-0.6.3-r5 241
+SHA256 32c78d10e852b45bba816c390d7ed87d87754ca91cad13a2946f717a6c22daca files/digest-sgml-common-0.6.3-r5 241
+MD5 9518ad388371b562c9376c868e64a44f files/sgml-common-0.6.3-configure.in.patch 360
+RMD160 03454741e40ff5436d58e2379ee9b8a8da8b5986 files/sgml-common-0.6.3-configure.in.patch 360
+SHA256 c1377215a0a92526cfa476dff941d00a713d156667ce37c39bf3f0fa02b71ad4 files/sgml-common-0.6.3-configure.in.patch 360
+MD5 d54c8e50cf0f9e8fc72433ca67cd848a files/sgml-common-0.6.3-install-catalog.in 4917
+RMD160 f4c330fbea31c09201f5c75cbf6e85e894327ebd files/sgml-common-0.6.3-install-catalog.in 4917
+SHA256 71db2836b286741b853897d040c22b9e632097c0039be32dc98fd0a83297b654 files/sgml-common-0.6.3-install-catalog.in 4917
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
-MD5 85fd418ceb1e460cb17a5d2ebfd86795 sgml-common-0.6.3-r4.ebuild 1996
-RMD160 d8971caaa61ae91791790af0ba32b61e50b09b5b sgml-common-0.6.3-r4.ebuild 1996
-SHA256 b8d5d214bc61a5e9c5879b775478f686852401914ef7983b092b8aa487d1efc8 sgml-common-0.6.3-r4.ebuild 1996
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEH2pt2+ySkm8kpY0RAqCcAJ9D92cOhtdsG5Tq2wuVLNlPUlQrqgCfaFFR
-xVcVApFdEpGUEwIboZ7KDVo=
-=ELDL
------END PGP SIGNATURE-----
+MD5 c80973d8c3b4e06ead6c6a8a58535c81 sgml-common-0.6.3-r4.ebuild 1995
+RMD160 3a703a06092f21edf0d95db6401463a2b08d2f31 sgml-common-0.6.3-r4.ebuild 1995
+SHA256 54290e28651217d368270554b5381cb6680eeb94583e408535a41fdddbff9320 sgml-common-0.6.3-r4.ebuild 1995
+MD5 c2a6d21ffde0daf2f11b19132d50bebf sgml-common-0.6.3-r4.ebuild.diff 1238
+RMD160 417657144c2bc0fc14905ac171acb44dacb9db6a sgml-common-0.6.3-r4.ebuild.diff 1238
+SHA256 f83ce9e86f1473a0a3ab83ebd0f71749bf0c37cab17c3c7cf220d864d96f7898 sgml-common-0.6.3-r4.ebuild.diff 1238
+MD5 5578a77c9f70073621846dcbea0112bf sgml-common-0.6.3-r5.ebuild 2053
+RMD160 0919c682ef88af564ad3a29b6141b4b5e3c70c5b sgml-common-0.6.3-r5.ebuild 2053
+SHA256 e0ba2e8c5b6390d8239790c6f69409b3d98c5cefd18a6491016da40fb8d11157 sgml-common-0.6.3-r5.ebuild 2053
diff --git a/app-text/sgml-common/files/digest-sgml-common-0.6.3-r4 b/app-text/sgml-common/files/digest-sgml-common-0.6.3-r4
index 876e0934660f..f6b0f1dc9234 100644
--- a/app-text/sgml-common/files/digest-sgml-common-0.6.3-r4
+++ b/app-text/sgml-common/files/digest-sgml-common-0.6.3-r4
@@ -1 +1,3 @@
 MD5 103c9828f24820df86e55e7862e28974 sgml-common-0.6.3.tgz 76783
+RMD160 246d01272f70cd8382a7d596392e61d7dc0eec78 sgml-common-0.6.3.tgz 76783
+SHA256 7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959 sgml-common-0.6.3.tgz 76783
diff --git a/app-text/sgml-common/files/digest-sgml-common-0.6.3-r5 b/app-text/sgml-common/files/digest-sgml-common-0.6.3-r5
new file mode 100644
index 000000000000..f6b0f1dc9234
--- /dev/null
+++ b/app-text/sgml-common/files/digest-sgml-common-0.6.3-r5
@@ -0,0 +1,3 @@
+MD5 103c9828f24820df86e55e7862e28974 sgml-common-0.6.3.tgz 76783
+RMD160 246d01272f70cd8382a7d596392e61d7dc0eec78 sgml-common-0.6.3.tgz 76783
+SHA256 7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959 sgml-common-0.6.3.tgz 76783
diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch b/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch
new file mode 100644
index 000000000000..85e25031b524
--- /dev/null
+++ b/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch
@@ -0,0 +1,13 @@
+Index: sgml-common-0.6.3/configure.in
+===================================================================
+--- sgml-common-0.6.3.orig/configure.in
++++ sgml-common-0.6.3/configure.in
+@@ -3,7 +3,7 @@ AC_INIT(Makefile.am)
+ 
+ AM_INIT_AUTOMAKE(sgml-common, 0.6.3)
+ 
+-docdir='$(prefix)/doc'
++docdir='$(prefix)/share/doc'
+ AC_SUBST(docdir)
+ 
+ dnl Checks for programs.
diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in b/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in
new file mode 100644
index 000000000000..9014d0ebb232
--- /dev/null
+++ b/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in
@@ -0,0 +1,180 @@
+#!/bin/sh
+# Script to install a catalog in the centralized SGML catalog
+# Send any comments to Eric Bischoff <eric@caldera.de>
+# This program is under GPL license. See LICENSE file for details.
+
+# Modified by Gentoo developers to better integrate it to portage.
+# <text-markup@gentoo.org>
+
+# Set help message
+SGML_HELP_MESSAGE="Usage: `basename $0` [<option>] <action>\n\
+where <option> is:\n\
+\040 -d|--delegate: \t\t\t Use DELEGATE instead of CATALOG\n\
+and where <action> is:\n\
+\040 -a|--add <centralized> <ordinary>: \t Declare ordinary catalog in the centralized catalog\n\
+\040 -r|--remove <centralized> <ordinary>:\t Remove ordinary catalog from the centralized catalog\n\
+\040 -h, --help: \t\t\t\t Print this help message and exit\n\
+\040 -v, --version: \t\t\t Print the version number and exit\n"
+
+# Set version message
+SGML_VERSION_MESSAGE="sgml-common version @VERSION@ (install-catalog version 1.0)"
+
+# Set type of pointer
+SGML_POINTER="CATALOG"
+
+# Set action to be performed
+SGML_ACTION=""
+
+# Set catalogs
+SGML_CENTRALIZED=""
+SGML_ORDINARY=""
+
+# Default ROOT value (usually defined by portage)
+[ -z "$ROOT" ] && ROOT="/"
+[[ $ROOT == */ ]] || ROOT="${ROOT}/"
+
+
+# Process options
+case $1 in
+   -d|--delegate) SGML_POINTER="DELEGATE"
+                shift 1
+                ;;
+esac
+
+# Process actions
+case $1 in
+   -a|--add)    SGML_ACTION="addition"
+		SGML_CENTRALIZED=$2
+		SGML_ORDINARY=$3
+		;;
+   -r|--remove)	if [ -z "$3" -o "$3" = "--version" ]
+		then
+		  echo "install-catalog: Old syntax; doing nothing"
+		  exit 0
+		fi
+   		SGML_ACTION="removal"
+		SGML_CENTRALIZED=$2
+		SGML_ORDINARY=$3
+		;;
+   -h|--help)	echo -e $SGML_HELP_MESSAGE
+		exit 0
+		;;
+   -v|--version) echo -e $SGML_VERSION_MESSAGE
+	 	exit 0
+		;;
+   --install)   echo "install-catalog: Old syntax; doing nothing"
+		exit 0
+		;;
+   *)		echo -e $SGML_HELP_MESSAGE >&2
+		exit 1
+		;;
+esac
+
+
+# The arguments to this program should always be relative to $ROOT. Here we
+# declare some extra variables to distingish between the absolute and
+# relative paths.
+SGML_ROOT_CENTRALIZED="${ROOT%/}${SGML_CENTRALIZED}"
+SGML_ROOT_ORDINARY="${ROOT%/}${SGML_ORDINARY}"
+
+
+# Check that the super catalog can be created and changed and deleted
+if [ ! -w ${ROOT}etc/sgml ]
+then
+  echo "`basename $0`: unable to write in ${ROOT}etc/sgml." >&2
+  exit 2
+fi
+case $SGML_ACTION in
+   addition)
+	if [ -e ${ROOT}etc/sgml/catalog -a ! -w ${ROOT}etc/sgml/catalog ]
+	then
+	  echo "`basename $0`: can not modify \"${ROOT}etc/sgml/catalog\"." >&2
+	  exit 2
+	fi
+	;;
+   removal)
+	if [ ! -w ${ROOT}etc/sgml/catalog ]
+	then
+	  echo "`basename $0`: can not modify \"${ROOT}etc/sgml/catalog\"." >&2
+	  exit 2
+	fi
+	;;
+esac
+
+# Check that the centralized catalog can be created, changed and deleted
+if [ -z "$SGML_ROOT_CENTRALIZED" ]
+then
+  echo -e $SGML_HELP_MESSAGE >&2
+  exit 1
+fi
+case $SGML_ACTION in
+   addition)
+	if [ -e "$SGML_ROOT_CENTRALIZED" -a ! -w "$SGML_ROOT_CENTRALIZED" ]
+	then
+	  echo "`basename $0`: can not modify \"$SGML_ROOT_CENTRALIZED\"." >&2
+	  exit 2
+	fi
+	;;
+   removal)
+	if [ ! -w "$SGML_ROOT_CENTRALIZED" ]
+	then
+	  echo "`basename $0`: can not modify \"$SGML_ROOT_CENTRALIZED\"." >&2
+	  exit 2
+	fi
+	;;
+esac
+
+# Check that we have at least one ordinary package to process
+if [ -z "$SGML_ROOT_ORDINARY" ]
+then
+  echo -e $SGML_HELP_MESSAGE >&2
+  exit 1
+fi
+case $SGML_ACTION in
+   addition)
+	if [ ! -s $SGML_ROOT_ORDINARY ]
+	then
+	  echo "`basename $0`: \"$SGML_ROOT_ORDINARY\" does not exist or is empty." >&2
+	  exit 2
+	fi
+	;;
+esac
+
+# Installation or removal of pointers
+case $SGML_ACTION in
+    addition)
+	echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED"
+	if grep -q $SGML_ORDINARY $SGML_ROOT_CENTRALIZED 2>/dev/null
+	then
+	  echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2
+	else
+	  echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> $SGML_ROOT_CENTRALIZED
+	fi
+	grep -q $SGML_CENTRALIZED ${ROOT}etc/sgml/catalog 2>/dev/null
+	if [ $? -ne 0 ]
+	then
+		echo "`basename $0`: addition of $SGML_CENTRALIZED in ${ROOT}etc/sgml/catalog"
+		echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> ${ROOT}etc/sgml/catalog
+	fi
+	;;
+   removal)
+	echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED"
+	if grep -q $SGML_ORDINARY $SGML_ROOT_CENTRALIZED 2>/dev/null
+	then
+		sed -e "\:$SGML_POINTER \"$SGML_ORDINARY\":d" < \
+			$SGML_ROOT_CENTRALIZED > ${SGML_ROOT_CENTRALIZED}.new
+		mv ${SGML_ROOT_CENTRALIZED}.new $SGML_ROOT_CENTRALIZED
+	else
+	  echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2
+	fi
+	if [ ! -s "$SGML_ROOT_CENTRALIZED" ]
+	then
+	  rm $SGML_ROOT_CENTRALIZED
+	  echo "`basename $0`: removal of $SGML_CENTRALIZED from ${ROOT}etc/sgml/catalog"
+          sed -e "\:$SGML_POINTER \"$SGML_CENTRALIZED\":d" < ${ROOT}etc/sgml/catalog > ${ROOT}etc/sgml/catalog.new
+          mv ${ROOT}etc/sgml/catalog.new ${ROOT}etc/sgml/catalog
+	fi
+	;;
+esac
+
+exit 0
diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-r4-install-catalog.in b/app-text/sgml-common/files/sgml-common-0.6.3-r4-install-catalog.in
deleted file mode 100644
index 9014d0ebb232..000000000000
--- a/app-text/sgml-common/files/sgml-common-0.6.3-r4-install-catalog.in
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-# Script to install a catalog in the centralized SGML catalog
-# Send any comments to Eric Bischoff <eric@caldera.de>
-# This program is under GPL license. See LICENSE file for details.
-
-# Modified by Gentoo developers to better integrate it to portage.
-# <text-markup@gentoo.org>
-
-# Set help message
-SGML_HELP_MESSAGE="Usage: `basename $0` [<option>] <action>\n\
-where <option> is:\n\
-\040 -d|--delegate: \t\t\t Use DELEGATE instead of CATALOG\n\
-and where <action> is:\n\
-\040 -a|--add <centralized> <ordinary>: \t Declare ordinary catalog in the centralized catalog\n\
-\040 -r|--remove <centralized> <ordinary>:\t Remove ordinary catalog from the centralized catalog\n\
-\040 -h, --help: \t\t\t\t Print this help message and exit\n\
-\040 -v, --version: \t\t\t Print the version number and exit\n"
-
-# Set version message
-SGML_VERSION_MESSAGE="sgml-common version @VERSION@ (install-catalog version 1.0)"
-
-# Set type of pointer
-SGML_POINTER="CATALOG"
-
-# Set action to be performed
-SGML_ACTION=""
-
-# Set catalogs
-SGML_CENTRALIZED=""
-SGML_ORDINARY=""
-
-# Default ROOT value (usually defined by portage)
-[ -z "$ROOT" ] && ROOT="/"
-[[ $ROOT == */ ]] || ROOT="${ROOT}/"
-
-
-# Process options
-case $1 in
-   -d|--delegate) SGML_POINTER="DELEGATE"
-                shift 1
-                ;;
-esac
-
-# Process actions
-case $1 in
-   -a|--add)    SGML_ACTION="addition"
-		SGML_CENTRALIZED=$2
-		SGML_ORDINARY=$3
-		;;
-   -r|--remove)	if [ -z "$3" -o "$3" = "--version" ]
-		then
-		  echo "install-catalog: Old syntax; doing nothing"
-		  exit 0
-		fi
-   		SGML_ACTION="removal"
-		SGML_CENTRALIZED=$2
-		SGML_ORDINARY=$3
-		;;
-   -h|--help)	echo -e $SGML_HELP_MESSAGE
-		exit 0
-		;;
-   -v|--version) echo -e $SGML_VERSION_MESSAGE
-	 	exit 0
-		;;
-   --install)   echo "install-catalog: Old syntax; doing nothing"
-		exit 0
-		;;
-   *)		echo -e $SGML_HELP_MESSAGE >&2
-		exit 1
-		;;
-esac
-
-
-# The arguments to this program should always be relative to $ROOT. Here we
-# declare some extra variables to distingish between the absolute and
-# relative paths.
-SGML_ROOT_CENTRALIZED="${ROOT%/}${SGML_CENTRALIZED}"
-SGML_ROOT_ORDINARY="${ROOT%/}${SGML_ORDINARY}"
-
-
-# Check that the super catalog can be created and changed and deleted
-if [ ! -w ${ROOT}etc/sgml ]
-then
-  echo "`basename $0`: unable to write in ${ROOT}etc/sgml." >&2
-  exit 2
-fi
-case $SGML_ACTION in
-   addition)
-	if [ -e ${ROOT}etc/sgml/catalog -a ! -w ${ROOT}etc/sgml/catalog ]
-	then
-	  echo "`basename $0`: can not modify \"${ROOT}etc/sgml/catalog\"." >&2
-	  exit 2
-	fi
-	;;
-   removal)
-	if [ ! -w ${ROOT}etc/sgml/catalog ]
-	then
-	  echo "`basename $0`: can not modify \"${ROOT}etc/sgml/catalog\"." >&2
-	  exit 2
-	fi
-	;;
-esac
-
-# Check that the centralized catalog can be created, changed and deleted
-if [ -z "$SGML_ROOT_CENTRALIZED" ]
-then
-  echo -e $SGML_HELP_MESSAGE >&2
-  exit 1
-fi
-case $SGML_ACTION in
-   addition)
-	if [ -e "$SGML_ROOT_CENTRALIZED" -a ! -w "$SGML_ROOT_CENTRALIZED" ]
-	then
-	  echo "`basename $0`: can not modify \"$SGML_ROOT_CENTRALIZED\"." >&2
-	  exit 2
-	fi
-	;;
-   removal)
-	if [ ! -w "$SGML_ROOT_CENTRALIZED" ]
-	then
-	  echo "`basename $0`: can not modify \"$SGML_ROOT_CENTRALIZED\"." >&2
-	  exit 2
-	fi
-	;;
-esac
-
-# Check that we have at least one ordinary package to process
-if [ -z "$SGML_ROOT_ORDINARY" ]
-then
-  echo -e $SGML_HELP_MESSAGE >&2
-  exit 1
-fi
-case $SGML_ACTION in
-   addition)
-	if [ ! -s $SGML_ROOT_ORDINARY ]
-	then
-	  echo "`basename $0`: \"$SGML_ROOT_ORDINARY\" does not exist or is empty." >&2
-	  exit 2
-	fi
-	;;
-esac
-
-# Installation or removal of pointers
-case $SGML_ACTION in
-    addition)
-	echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED"
-	if grep -q $SGML_ORDINARY $SGML_ROOT_CENTRALIZED 2>/dev/null
-	then
-	  echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2
-	else
-	  echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> $SGML_ROOT_CENTRALIZED
-	fi
-	grep -q $SGML_CENTRALIZED ${ROOT}etc/sgml/catalog 2>/dev/null
-	if [ $? -ne 0 ]
-	then
-		echo "`basename $0`: addition of $SGML_CENTRALIZED in ${ROOT}etc/sgml/catalog"
-		echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> ${ROOT}etc/sgml/catalog
-	fi
-	;;
-   removal)
-	echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED"
-	if grep -q $SGML_ORDINARY $SGML_ROOT_CENTRALIZED 2>/dev/null
-	then
-		sed -e "\:$SGML_POINTER \"$SGML_ORDINARY\":d" < \
-			$SGML_ROOT_CENTRALIZED > ${SGML_ROOT_CENTRALIZED}.new
-		mv ${SGML_ROOT_CENTRALIZED}.new $SGML_ROOT_CENTRALIZED
-	else
-	  echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2
-	fi
-	if [ ! -s "$SGML_ROOT_CENTRALIZED" ]
-	then
-	  rm $SGML_ROOT_CENTRALIZED
-	  echo "`basename $0`: removal of $SGML_CENTRALIZED from ${ROOT}etc/sgml/catalog"
-          sed -e "\:$SGML_POINTER \"$SGML_CENTRALIZED\":d" < ${ROOT}etc/sgml/catalog > ${ROOT}etc/sgml/catalog.new
-          mv ${ROOT}etc/sgml/catalog.new ${ROOT}etc/sgml/catalog
-	fi
-	;;
-esac
-
-exit 0
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild
index 0dbd53bb7786..af3987766bdc 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild,v 1.31 2006/03/21 02:51:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild,v 1.32 2006/03/26 13:56:30 nattfodd Exp $
 
 DESCRIPTION="Base ISO character entities and utilities for SGML"
 HOMEPAGE="http://www.iso.ch/cate/3524030.html"
@@ -18,7 +18,7 @@ src_unpack() {
 	unpack ${A}
 	# We use a hacked version of install-catalog that supports the ROOT
 	# variable, and puts quotes around the CATALOG files.
-	cp "${FILESDIR}/${PF}-install-catalog.in" "${S}/bin/install-catalog.in"
+	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in"
 	cd "${S}"
 	automake -a
 }
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
new file mode 100644
index 000000000000..485bac4144ab
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.1 2006/03/26 13:56:30 nattfodd Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Base ISO character entities and utilities for SGML"
+HOMEPAGE="http://www.iso.ch/cate/3524030.html"
+SRC_URI="mirror://kde/devel/docbook/SOURCES/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64
+~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	# We use a hacked version of install-catalog that supports the ROOT
+	# variable, and puts quotes around the CATALOG files.
+	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in"
+	cd ${S}
+	epatch ${FILESDIR}/${P}-configure.in.patch
+	eautoreconf
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+}
+
+pkg_postinst() {
+	local installer="${ROOT}usr/bin/install-catalog"
+	if [ ! -x "${installer}" ]; then
+		eerror "install-catalog not found! Something went wrong!"
+		die
+	fi
+
+	einfo "Installing Catalogs..."
+	$installer --add \
+		/etc/sgml/sgml-ent.cat \
+		/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+	$installer --add \
+		/etc/sgml/sgml-docbook.cat \
+		/etc/sgml/sgml-ent.cat
+
+	local file
+	for file in `find ${ROOT}etc/sgml/ -name "*.cat"` ${ROOT}etc/sgml/catalog
+	do
+		einfo "Fixing ${file}"
+		awk '/"$/ { print $1 " " $2 }
+			! /"$/ { print $1 " \"" $2 "\"" }' ${file} > ${file}.new
+		mv ${file}.new ${file}
+	done
+}
+
+pkg_prerm() {
+	cp ${ROOT}usr/bin/install-catalog ${T}
+}
+
+pkg_postrm() {
+	if [ ! -x  "${T}/install-catalog" ]; then
+		return
+	fi
+
+	einfo "Removing Catalogs..."
+	if [ -e "${ROOT}etc/sgml/sgml-ent.cat" ]; then
+		${T}/install-catalog --remove \
+			/etc/sgml/sgml-ent.cat \
+			/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+	fi
+
+	if [ -e "${ROOT}etc/sgml/sgml-docbook.cat" ]; then
+		${T}/install-catalog --remove \
+			/etc/sgml/sgml-docbook.cat \
+			/etc/sgml/sgml-ent.cat
+	fi
+}
-- 
cgit v1.2.3-65-gdbad