* Latest DocBook5 beta.

* Removed schemas/xml-dtd/docbook-5.0, it's subsumed by
  schemas/docbook5 which contains both the RelaxNG and DTD schemata,
  as well some other stuff.

svn path=/nixpkgs/trunk/; revision=6178

pkgs/data/sgml+xml/schemas/docbook-ng/builder.sh

@@ -1,13 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/xml/rng/docbook
-cd $out/xml/rng/docbook
-cp $rng   docbook.rng
-cp $rnc   docbook.rnc
-cp $xirng docbookxi.rng
-cp $xirnc docbookxi.rnc
-
-mkdir -p $out/xml/dtd/docbook
-cd $out/xml/dtd/docbook
-cp $dtd   docbook.dtd
-cp $xidtd docbookxi.dtd

pkgs/data/sgml+xml/schemas/docbook-ng/default.nix

@@ -1,39 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-assert unzip != null;
-
-stdenv.mkDerivation {
-  name = "docbook-ng-5.0pre20050724-pto";
-  builder = ./builder.sh;
-  buildInputs = [unzip];
-
-  rng = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbook.rng;
-    md5 = "508a56c9602e0321f64df4b5032f4a05";
-  };
-
-  rnc = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbook.rnc;
-    md5 = "046e583f912fb38c28035cbdec055fc7";
-  };
-
-  xirng = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbookxi.rng;
-    md5 = "e377fb2d80d96f098e367003ad51a983";
-  };
-
-  xirnc = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbookxi.rnc;
-    md5 = "e8a233600fc58a1eab04451f530d4455";
-  };
-
-  dtd = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbook.dtd;
-    md5 = "65f04909e0f9f64c18f0c5267d95bf70";
-  };
-
-  xidtd = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/docbookxi.dtd;
-    md5 = "37168ed996c5271d818eb258f1509834";
-  };
-}

pkgs/data/sgml+xml/schemas/docbook5/builder.sh

@@ -0,0 +1,17 @@
+source $stdenv/setup
+
+unpackFile $src
+
+cd docbook-*
+
+ensureDir $out/xml/rng
+cp -prv rng $out/xml/rng/docbook
+
+ensureDir $out/xml/dtd
+cp -prv dtd $out/xml/dtd/docbook
+
+ensureDir $out/share/doc
+cp -prv docs $out/share/doc/docbook
+
+ensureDir $out/share/docbook
+cp -prv tools $out/share/docbook/

pkgs/data/sgml+xml/schemas/docbook5/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "docbook5-5.0-pre-beta7";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://www.docbook.org/xml/5.0b7/docbook-5.0b7.tar.gz;
+    md5 = "f1e18aaf56b0f0b2b2ab9eaff4bb6a1e";
+  };
+}

pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/builder.sh

@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out/xml/dtd/docbook
-
-cd $out/xml/dtd/docbook
-unpackFile $src
-mv docbook-*/* .
-rmdir docbook-*

pkgs/data/sgml+xml/schemas/xml-dtd/docbook-5.0/default.nix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "docbook-5.0b6";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://docbook.org/xml/5.0b6/docbook-5.0b6.tar.gz;
-    md5 = "4bf53ff6eb4721a14b37c97155379bd2";
-  };
-}

pkgs/top-level/all-packages.nix

@@ -398,7 +398,7 @@ rec {
 
   gnupg = import ../tools/security/gnupg {
     inherit fetchurl stdenv;
-    ideaSupport = false; # enable for IDEA crypto support
+    ideaSupport = true; # enable for IDEA crypto support
   };
 
   mjpegtools = (import ../tools/video/mjpegtools) {
@@ -2060,7 +2060,7 @@ rec {
     inherit fetchurl stdenv unzip;
   };
 
-  docbook5x = (import ../data/sgml+xml/schemas/xml-dtd/docbook-5.0) {
+  docbook5 = (import ../data/sgml+xml/schemas/docbook5) {
     inherit fetchurl stdenv;
   };