From 464b98af16e7da5e2c79cb2aa19f305322f34598 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 4 Jul 2014 21:04:40 +0200
Subject: [PATCH] Move catalog files for docbook to data/xml

These are not supposed to be configuration files.
---
 .../docbook_xml_dtd/docbook_xml_dtd-4.3.recipe | 18 +++++++-----------
 .../docbook_xml_dtd/docbook_xml_dtd-4.5.recipe | 18 +++++++-----------
 .../docbook_xsl_stylesheets-1.78.1.recipe      |  5 ++---
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe
index 96ce90472..1899845bd 100644
--- a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe
+++ b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe
@@ -45,9 +45,9 @@ INSTALL()
 	cp -v -af docbook.cat *.dtd ent/ *.mod \
 		$dataDir/xml/docbook/xml-dtd-$portVersion
 
-	mkdir -p $settingsDir/etc/xml/catalog
+	mkdir -p $dataDir/xml/catalog
 
-	CATALOG=$settingsDir/etc/xml/docbook
+	CATALOG=$dataDir/xml/docbook-$portVersion
 	xmlcatalog --noout --create $CATALOG
 
 	xmlcatalog --noout --add "public" \
@@ -95,28 +95,24 @@ INSTALL()
 		"file://$dataDir/xml/docbook/xml-dtd-$portVersion" \
 		$CATALOG
 
-	CATALOG=$settingsDir/etc/xml/catalog/docbook-xml-dtd
+	CATALOG=$dataDir/xml/catalog/docbook-xml-dtd
 	xmlcatalog --noout --create $CATALOG
 
 	xmlcatalog --noout --add "delegatePublic" \
 		"-//OASIS//ENTITIES DocBook XML" \
-		"file://$settingsDir/etc/xml/docbook" \
+		"file://$dataDir/xml/docbook-$portVersion" \
 		$CATALOG
 	xmlcatalog --noout --add "delegatePublic" \
 		"-//OASIS//DTD DocBook XML" \
-		"file://$settingsDir/etc/xml/docbook" \
+		"file://$dataDir/xml/docbook-$portVersion" \
 		$CATALOG
 	xmlcatalog --noout --add "delegateSystem" \
 		"http://www.oasis-open.org/docbook/" \
-		"file://$settingsDir/etc/xml/docbook" \
+		"file://$dataDir/xml/docbook-$portVersion" \
 		$CATALOG
 	xmlcatalog --noout --add "delegateURI" \
 		"http://www.oasis-open.org/docbook/" \
-		"file://$settingsDir/etc/xml/docbook" \
+		"file://$dataDir/xml/docbook-$portVersion" \
 		$CATALOG
 }
 
-GLOBAL_WRITABLE_FILES="
-	settings/etc/xml/catalog/docbook-xml-dtd keep-old
-	settings/etc/xml/docbook keep-old
-"
diff --git a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe
index 0d891ee12..7871ce3de 100644
--- a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe
+++ b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe
@@ -45,9 +45,9 @@ INSTALL()
 	cp -v -af docbook.cat *.dtd ent/ *.mod \
 		$dataDir/xml/docbook/xml-dtd-$portVersion
 
-	mkdir -p $settingsDir/etc/xml/catalog
+	mkdir -p $dataDir/xml/catalog
 
-	CATALOG=$settingsDir/etc/xml/docbook
+	CATALOG=$dataDir/xml/docbook-$portVersion
 	xmlcatalog --noout --create $CATALOG
 
 	xmlcatalog --noout --add "public" \
@@ -95,28 +95,24 @@ INSTALL()
 		"file://$dataDir/xml/docbook/xml-dtd-$portVersion" \
 		$CATALOG
 
-	CATALOG=$settingsDir/etc/xml/catalog/docbook-xml-dtd
+	CATALOG=$dataDir/xml/catalog/docbook-xml-dtd
 	xmlcatalog --noout --create $CATALOG
 
 	xmlcatalog --noout --add "delegatePublic" \
 		"-//OASIS//ENTITIES DocBook XML" \
-		"file://$settingsDir/etc/xml/docbook" \
+		"file://$dataDir/xml/docbook-$portVersion" \
 		$CATALOG
 	xmlcatalog --noout --add "delegatePublic" \
 		"-//OASIS//DTD DocBook XML" \
-		"file://$settingsDir/etc/xml/docbook" \
+		"file://$dataDir/xml/docbook-$portVersion" \
 		$CATALOG
 	xmlcatalog --noout --add "delegateSystem" \
 		"http://www.oasis-open.org/docbook/" \
-		"file://$settingsDir/etc/xml/docbook" \
+		"file://$dataDir/xml/docbook-$portVersion" \
 		$CATALOG
 	xmlcatalog --noout --add "delegateURI" \
 		"http://www.oasis-open.org/docbook/" \
-		"file://$settingsDir/etc/xml/docbook" \
+		"file://$dataDir/xml/docbook-$portVersion" \
 		$CATALOG
 }
 
-GLOBAL_WRITABLE_FILES="
-	settings/etc/xml/catalog/docbook-xml-dtd keep-old
-	settings/etc/xml/docbook keep-old
-"
diff --git a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe
index 645406032..d8b23892c 100644
--- a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe
+++ b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe
@@ -45,9 +45,9 @@ INSTALL()
 
 	ln -s VERSION $dataDir/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl
 
-	mkdir -p $settingsDir/etc/xml/catalog
+	mkdir -p $dataDir/xml/catalog
 
-	CATALOG=$settingsDir/etc/xml/catalog/docbook-xsl
+	CATALOG=$dataDir/xml/catalog/docbook-xsl
 	xmlcatalog --noout --create $CATALOG
 
 	xmlcatalog --noout --add "rewriteSystem" \
@@ -71,4 +71,3 @@ INSTALL()
     $CATALOG
 }
 
-GLOBAL_WRITABLE_FILES="settings/etc/xml/catalog/docbook-xsl keep-old"