Drop install-sh FreeBSD hack in stable ebuilds #537850 by Cyril Hrubis.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 10 insertions, 22 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 823ae3595973..37cc1963ced3 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.281 2014/11/29 14:57:59 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.282 2015/02/15 02:18:59 vapier Exp $
+
+  15 Feb 2015; Mike Frysinger <vapier@gentoo.org> graphviz-2.26.3-r3.ebuild,
+  graphviz-2.26.3-r4.ebuild:
+  Drop install-sh FreeBSD hack in stable ebuilds #537850 by Cyril Hrubis.
 
   29 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   graphviz-2.26.3-r4.ebuild:
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild
index 25f4d5beaa9b..b3a4d3efdbb2 100644
--- a/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild,v 1.13 2014/02/06 12:19:14 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild,v 1.14 2015/02/15 02:18:59 vapier Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2"
@@ -119,14 +119,6 @@ src_prepare() {
 	sed -i -e '/libltdl/d' configure.ac || die
 	sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die
 
-	# Update this file from our local libtool which is much newer than the
-	# bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD.
-	if has_version ">=sys-devel/libtool-2" ; then
-		cp "${EPREFIX}"/usr/share/libtool/config/install-sh config || die
-	else
-		cp "${EPREFIX}"/usr/share/libtool/install-sh config || die
-	fi
-
 	# no nls, no gettext, no iconv macro, so disable it
 	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
 
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
index 5671af89fde0..1affe207b3f6 100644
--- a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
+++ b/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild,v 1.14 2014/11/29 14:57:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild,v 1.15 2015/02/15 02:18:59 vapier Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2"
@@ -122,14 +122,6 @@ src_prepare() {
 	sed -i -e '/libltdl/d' configure.ac || die
 	sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die
 
-	# Update this file from our local libtool which is much newer than the
-	# bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD.
-	if has_version ">=sys-devel/libtool-2" ; then
-		cp "${EPREFIX}"/usr/share/libtool/config/install-sh config || die
-	else
-		cp "${EPREFIX}"/usr/share/libtool/install-sh config || die
-	fi
-
 	# no nls, no gettext, no iconv macro, so disable it
 	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }