From 91593cc2011e5ca9c9bb1e2f754db4f5c2c9dff0 Mon Sep 17 00:00:00 2001 From: frank Date: Wed, 11 Apr 2012 13:15:56 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- ImageMagick/delegates.xml | 4 +- ImageMagick/policy.xml | 7 +- ImageMagick/type-ghostscript.xml | 68 +++++++++---------- config-archive/etc/ImageMagick/delegates.xml | 10 +-- .../etc/ImageMagick/delegates.xml.1 | 14 ++-- .../etc/ImageMagick/delegates.xml.dist | 4 +- config-archive/etc/ImageMagick/policy.xml | 6 +- .../etc/ImageMagick/policy.xml.1 | 13 ++-- .../etc/ImageMagick/policy.xml.dist | 7 +- .../etc/ImageMagick/type-ghostscript.xml | 54 +++++++++++++++ .../etc/ImageMagick/type-ghostscript.xml.dist | 0 11 files changed, 121 insertions(+), 66 deletions(-) rename ImageMagick/._cfg0000_delegates.xml => config-archive/etc/ImageMagick/delegates.xml.1 (90%) rename ImageMagick/._cfg0000_policy.xml => config-archive/etc/ImageMagick/policy.xml.1 (80%) create mode 100644 config-archive/etc/ImageMagick/type-ghostscript.xml rename ImageMagick/._cfg0000_type-ghostscript.xml => config-archive/etc/ImageMagick/type-ghostscript.xml.dist (100%) diff --git a/ImageMagick/delegates.xml b/ImageMagick/delegates.xml index 3870f06d..a21e0e7f 100644 --- a/ImageMagick/delegates.xml +++ b/ImageMagick/delegates.xml @@ -66,7 +66,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/ImageMagick/policy.xml b/ImageMagick/policy.xml index 19e97962..3be0a4bc 100644 --- a/ImageMagick/policy.xml +++ b/ImageMagick/policy.xml @@ -39,9 +39,10 @@ - Note, resource policies are maximums for each instance of ImageMagick (e.g. - policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit - is 1GB). + Define arguments for the memory, map, area, and disk resources with + SI prefixes (.e.g 100MB). In addition, resource policies are maximums for + each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB + exceeds policy maximum so memory limit is 1GB). --> diff --git a/ImageMagick/type-ghostscript.xml b/ImageMagick/type-ghostscript.xml index 30182b86..213cb31a 100644 --- a/ImageMagick/type-ghostscript.xml +++ b/ImageMagick/type-ghostscript.xml @@ -17,38 +17,38 @@ ]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config-archive/etc/ImageMagick/delegates.xml b/config-archive/etc/ImageMagick/delegates.xml index db829d8e..3870f06d 100644 --- a/config-archive/etc/ImageMagick/delegates.xml +++ b/config-archive/etc/ImageMagick/delegates.xml @@ -80,14 +80,14 @@ - + - + - + @@ -100,11 +100,11 @@ - + - + diff --git a/ImageMagick/._cfg0000_delegates.xml b/config-archive/etc/ImageMagick/delegates.xml.1 similarity index 90% rename from ImageMagick/._cfg0000_delegates.xml rename to config-archive/etc/ImageMagick/delegates.xml.1 index a21e0e7f..db829d8e 100644 --- a/ImageMagick/._cfg0000_delegates.xml +++ b/config-archive/etc/ImageMagick/delegates.xml.1 @@ -66,7 +66,7 @@ - + @@ -80,14 +80,14 @@ - + - + - + @@ -100,11 +100,11 @@ - + - + - + diff --git a/config-archive/etc/ImageMagick/delegates.xml.dist b/config-archive/etc/ImageMagick/delegates.xml.dist index 3870f06d..a21e0e7f 100644 --- a/config-archive/etc/ImageMagick/delegates.xml.dist +++ b/config-archive/etc/ImageMagick/delegates.xml.dist @@ -66,7 +66,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/config-archive/etc/ImageMagick/policy.xml b/config-archive/etc/ImageMagick/policy.xml index 28eda178..19e97962 100644 --- a/config-archive/etc/ImageMagick/policy.xml +++ b/config-archive/etc/ImageMagick/policy.xml @@ -37,7 +37,7 @@ Any large image is cached to disk rather than memory: - + Note, resource policies are maximums for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit @@ -48,8 +48,8 @@ - - + + diff --git a/ImageMagick/._cfg0000_policy.xml b/config-archive/etc/ImageMagick/policy.xml.1 similarity index 80% rename from ImageMagick/._cfg0000_policy.xml rename to config-archive/etc/ImageMagick/policy.xml.1 index 3be0a4bc..28eda178 100644 --- a/ImageMagick/._cfg0000_policy.xml +++ b/config-archive/etc/ImageMagick/policy.xml.1 @@ -37,20 +37,19 @@ Any large image is cached to disk rather than memory: - + - Define arguments for the memory, map, area, and disk resources with - SI prefixes (.e.g 100MB). In addition, resource policies are maximums for - each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB - exceeds policy maximum so memory limit is 1GB). + Note, resource policies are maximums for each instance of ImageMagick (e.g. + policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit + is 1GB). --> - - + + diff --git a/config-archive/etc/ImageMagick/policy.xml.dist b/config-archive/etc/ImageMagick/policy.xml.dist index 19e97962..3be0a4bc 100644 --- a/config-archive/etc/ImageMagick/policy.xml.dist +++ b/config-archive/etc/ImageMagick/policy.xml.dist @@ -39,9 +39,10 @@ - Note, resource policies are maximums for each instance of ImageMagick (e.g. - policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit - is 1GB). + Define arguments for the memory, map, area, and disk resources with + SI prefixes (.e.g 100MB). In addition, resource policies are maximums for + each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB + exceeds policy maximum so memory limit is 1GB). --> diff --git a/config-archive/etc/ImageMagick/type-ghostscript.xml b/config-archive/etc/ImageMagick/type-ghostscript.xml new file mode 100644 index 00000000..30182b86 --- /dev/null +++ b/config-archive/etc/ImageMagick/type-ghostscript.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ImageMagick/._cfg0000_type-ghostscript.xml b/config-archive/etc/ImageMagick/type-ghostscript.xml.dist similarity index 100% rename from ImageMagick/._cfg0000_type-ghostscript.xml rename to config-archive/etc/ImageMagick/type-ghostscript.xml.dist -- 2.39.5