ReRevert Merge x-updates into master

This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix

pkgs/tools/graphics/zbar/default.nix

@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l
-  , qt4, lzma
+  , qt4, lzma, gtk2
   , ...}:
 builderDefsPackage
 (a :  

pkgs/tools/typesetting/pdf2djvu/default.nix

@@ -1,12 +1,12 @@
 {stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.11";
+  version = "0.7.16";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz";
-    sha256 = "00gscd7l02jyr132vlj08ks0pgmh5ja785n3fdxa795cib45rbgq";
+    sha256 = "1yg4ppqxpfda89yi4c3rrq2zhar5dzyqypvqdvdd0r7is2321nnv";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     description = "Creates djvu files from PDF files";
     homepage = http://code.google.com/p/pdf2djvu/;
     license = stdenv.lib.licenses.gpl2;
+    inherit version;
   };
 }

pkgs/tools/typesetting/pdf2djvu/default.upstream

@@ -0,0 +1,10 @@
+url http://code.google.com/p/pdf2djvu/downloads/list
+version_link '[.]tar[.][a-z0-9]+$'
+process 'code[.]google[.]com//' ''
+version '.*_([0-9.]+[0-9]).*' '\1'
+
+do_overwrite () {
+  ensure_hash
+  set_var_value version "$CURRENT_VERSION"
+  set_var_value sha256 "$CURRENT_HASH"
+}