From eb81f33244dc17edb2401273ca4481623c7c6e09 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 9 Mar 2012 20:16:02 +0000
Subject: [PATCH] Remove zapping, zvbi and rte

Feel free to revert&fix compile if you need these packages.

svn path=/nixpkgs/trunk/; revision=32966
---
 pkgs/applications/video/zapping/0.10.nix    | 38 --------------------
 pkgs/applications/video/zapping/builder.sh  |  9 -----
 pkgs/applications/video/zapping/default.nix | 39 ---------------------
 pkgs/development/libraries/rte/default.nix  |  9 -----
 pkgs/development/libraries/zvbi/default.nix | 15 --------
 pkgs/top-level/all-packages.nix             | 15 --------
 6 files changed, 125 deletions(-)
 delete mode 100644 pkgs/applications/video/zapping/0.10.nix
 delete mode 100644 pkgs/applications/video/zapping/builder.sh
 delete mode 100644 pkgs/applications/video/zapping/default.nix
 delete mode 100644 pkgs/development/libraries/rte/default.nix
 delete mode 100644 pkgs/development/libraries/zvbi/default.nix

diff --git a/pkgs/applications/video/zapping/0.10.nix b/pkgs/applications/video/zapping/0.10.nix
deleted file mode 100644
index 067917abe77b..000000000000
--- a/pkgs/applications/video/zapping/0.10.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ teletextSupport ? true
-, jpegSupport ? true
-, pngSupport ? true
-, recordingSupport ? true
-# !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
-, stdenv, fetchurl, pkgconfig, perl, python, x11
-, libXv, libXmu, libXext, libgnomeui
-, libglade, scrollkeeper, esound, gettext, perlXMLParser
-, zvbi ? null, libjpeg ? null, libpng ? null, rte ? null }:
-
-assert teletextSupport -> zvbi != null && zvbi.pngSupport
-  /* !!! && pngSupport && zvbi.libpng == libpng */;
-
-assert jpegSupport -> libjpeg != null;
-assert pngSupport -> libpng != null;
-
-assert recordingSupport -> rte != null;
-
-stdenv.mkDerivation {
-  name = "zapping-0.10cvs6";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nixos.org/tarballs/zapping-0.10cvs6.tar.bz2;
-    md5 = "6aa7614ac3fd5d39c89c2198598ad27b";
-  };
-
-  inherit teletextSupport jpegSupport pngSupport libXext;
-
-  buildInputs = [
-    pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui
-    libglade scrollkeeper esound gettext
-    (if teletextSupport then zvbi else null)
-    (if jpegSupport then libjpeg else null)
-    (if pngSupport then libpng else null)
-    (if recordingSupport then rte else null)
-  ];
-}
diff --git a/pkgs/applications/video/zapping/builder.sh b/pkgs/applications/video/zapping/builder.sh
deleted file mode 100644
index 51387e5b8a71..000000000000
--- a/pkgs/applications/video/zapping/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-# !!! hack
-NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
-
-# !!! hack - `make install' tries to setuid to root
-installFlags="ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g`"
-
-genericBuild
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
deleted file mode 100644
index 29fcc31e8b9a..000000000000
--- a/pkgs/applications/video/zapping/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ teletextSupport ? true
-, jpegSupport ? true
-, pngSupport ? true
-, recordingSupport ? true
-# !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
-, stdenv, fetchurl, pkgconfig, perl, python, x11
-, libXv, libXmu, libXext, libgnomeui
-, libglade, scrollkeeper, esound, gettext, perlXMLParser
-, zvbi ? null, libjpeg ? null, libpng ? null, rte ? null }:
-
-assert teletextSupport -> zvbi != null && zvbi.pngSupport
-  /* !!! && pngSupport && zvbi.libpng == libpng */;
-
-assert jpegSupport -> libjpeg != null;
-assert pngSupport -> libpng != null;
-
-assert recordingSupport -> rte != null;
-
-stdenv.mkDerivation {
-  name = "zapping-0.9.6";
-
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = mirror://sourceforge/zapping/zapping-0.9.6.tar.bz2;
-    md5 = "8306775c6a11de4d72345b5eee970ea6";
-  };
-
-  inherit teletextSupport jpegSupport pngSupport libXext;
-
-  buildInputs = [
-    pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui
-    libglade scrollkeeper esound gettext
-    (if teletextSupport then zvbi else null)
-    (if jpegSupport then libjpeg else null)
-    (if pngSupport then libpng else null)
-    (if recordingSupport then rte else null)
-  ];
-}
diff --git a/pkgs/development/libraries/rte/default.nix b/pkgs/development/libraries/rte/default.nix
deleted file mode 100644
index 1862bad3947c..000000000000
--- a/pkgs/development/libraries/rte/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "rte-0.5.6";
-  src = fetchurl {
-    url = mirror://sourceforge/zapping/rte-0.5.6.tar.bz2;
-    md5 = "6259cdff255af71c23a4576e7c5664a0";
-  };
-}
diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix
deleted file mode 100644
index a0e111c482c1..000000000000
--- a/pkgs/development/libraries/zvbi/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pngSupport ? true
-, stdenv, fetchurl, x11, libpng ? null}:
-
-assert x11 != null;
-assert pngSupport -> libpng != null;
-
-stdenv.mkDerivation {
-  name = "zvbi-0.2.12";
-  src = fetchurl {
-    url = mirror://sourceforge/zapping/zvbi-0.2.22.tar.bz2;
-    md5 = "a01cbe39a48579ba92582ff75a5e37c2";
-  };
-  buildInputs = [x11 (if pngSupport then libpng else null)];
-  inherit pngSupport;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8676a381eb54..40e73b1b8bf8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4603,8 +4603,6 @@ let
 
   rlog = callPackage ../development/libraries/rlog { };
 
-  rte = callPackage ../development/libraries/rte { };
-
   rubberband = callPackage ../development/libraries/rubberband {
     fftw = fftwSinglePrec;
     inherit (vamp) vampSDK;
@@ -4862,11 +4860,6 @@ let
 
   zeromq = callPackage ../development/libraries/zeromq {};
 
-  zvbi = callPackage ../development/libraries/zvbi {
-    pngSupport = true;
-  };
-
-
   ### DEVELOPMENT / LIBRARIES / JAVA
 
 
@@ -7672,14 +7665,6 @@ let
     fltk = fltk13;
   };
 
-  zapping = callPackage ../applications/video/zapping {
-    inherit (gnome) scrollkeeper libgnomeui libglade esound;
-    teletextSupport = true;
-    jpegSupport = true;
-    pngSupport = true;
-    recordingSupport = true;
-  };
-
   zathura = callPackage ../applications/misc/zathura { };
 
   zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };