* acl, attr: updated, and use libtool 2.

* Removed libtoolOld.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14792

4 files changed, 18 insertions, 26 deletions

diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index 342c07a1b3e6d..698429c0a8812 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -4,9 +4,8 @@ stdenv.mkDerivation {
   name = "acl-2.2.47";
 
   src = fetchurl {
-    # The file cannot be downloaded from sgi.com.
-    #url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.47-1.tar.gz;
-    url = "http://gentoo.chem.wisc.edu/gentoo/distfiles/acl_2.2.47-1.tar.gz";
+    # The SGI site throws away old versions, so don't use it.
+    url = mirror://gentoo/distfiles/acl_2.2.47-1.tar.gz;
     sha256 = "1j39g62fki0iyji9s62slgwdfskpkqy7rmjlqcnmsvsnxbxhc294";
   };
 
@@ -15,4 +14,9 @@ stdenv.mkDerivation {
   configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk";
 
   installTargets = "install install-lib install-dev";
+
+  meta = {
+    homepage = ftp://oss.sgi.com/projects/xfs/cmd_tars/;
+    description = "Library and tools for manipulating access control lists";
+  };
 }
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 5b8aa839cf877..532f97a9fdf30 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -1,13 +1,12 @@
 {stdenv, fetchurl, libtool, gettext}:
 
 stdenv.mkDerivation {
-  name = "attr-2.4.41";
+  name = "attr-2.4.43";
 
   src = fetchurl {
-    # The file cannot be downloaded from sgi.com.
-    #url = ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.41-1.tar.gz;
-    url = "http://gentoo.chem.wisc.edu/gentoo/distfiles/attr_2.4.41-1.tar.gz";
-    sha256 = "0dc286g8vr402aca6wg945sdm92bys8a142vrkwx6bkjz4bwz6gp";
+    # The SGI site throws away old versions, so don't use it.
+    url = mirror://gentoo/distfiles/attr_2.4.43-1.tar.gz;
+    sha256 = "1gy5zspj8ynxv6q29r24d18cfvq06zirg1pxcdg27bg2ncrv4n6k";
   };
 
   buildInputs = [libtool gettext];
@@ -15,4 +14,9 @@ stdenv.mkDerivation {
   configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk";
 
   installTargets = "install install-lib install-dev";
+
+  meta = {
+    homepage = ftp://oss.sgi.com/projects/xfs/cmd_tars/;
+    description = "Library and tools for manipulating extended attributes";
+  };
 }
diff --git a/pkgs/development/tools/misc/libtool/old.nix b/pkgs/development/tools/misc/libtool/old.nix
deleted file mode 100644
index b955ccbc3c88c..0000000000000
--- a/pkgs/development/tools/misc/libtool/old.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, m4, perl}:
-
-stdenv.mkDerivation rec {
-  name = "libtool-1.5.26";
-  src = fetchurl {
-    url = "mirror://gnu/libtool/" + name + ".tar.gz";
-    sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w";
-  };
-  buildInputs = [m4 perl];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79b15f7a5d7b8..8337ab7b9792a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2466,10 +2466,6 @@ let
     inherit fetchurl stdenv lzma perl m4;
   };
 
-  libtoolOld = lowPrio (import ../development/tools/misc/libtool/old.nix {
-    inherit fetchurl stdenv perl m4;
-  });
-
   lsof = import ../development/tools/misc/lsof {
     inherit fetchurl stdenv;
   };
@@ -2608,8 +2604,7 @@ let
 
   acl = useFromStdenv "acl"
     (import ../development/libraries/acl {
-      inherit stdenv fetchurl gettext attr;
-      libtool = libtoolOld;
+      inherit stdenv fetchurl gettext attr libtool;
     });
 
   adns = selectVersion ../development/libraries/adns "1.4" {
@@ -2663,8 +2658,7 @@ let
 
   attr = useFromStdenv "attr"
     (import ../development/libraries/attr {
-      inherit stdenv fetchurl gettext;
-      libtool = libtoolOld;
+      inherit stdenv fetchurl gettext libtool;
     });
 
   axis = import ../development/libraries/axis {