removed sed from global scope (replaced with versionator) (#68915)

6 files changed, 41 insertions, 38 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 54eb0fa09c96..93590746ea34 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.97 2004/10/16 19:07:53 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.98 2004/10/26 09:31:15 liquidx Exp $
+
+  26 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  libgtkhtml-3.0.10-r1.ebuild, libgtkhtml-3.0.10.ebuild,
+  libgtkhtml-3.2.2.ebuild, libgtkhtml-3.2.3.ebuild:
+  removed sed from global scope (replaced with versionator) (#68915)
 
 *libgtkhtml-3.2.3 (16 Oct 2004)
 
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 7168c0226ec5..d2bf18c83061 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,14 +1,17 @@
-MD5 311c1fb4e46d796ed352acdc7b7c2211 ChangeLog 12591
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 639c810df807ceaec103943cc01dcec6 ChangeLog 12819
 MD5 8acfa41ae70e02c74b94da8d51dcaee7 libgtkhtml-2.4.0.ebuild 838
 MD5 bc5fca32cbca890743487c8947e1679c libgtkhtml-2.4.1.ebuild 848
 MD5 8632089b6020f33a5591e71bbb838ffd libgtkhtml-2.6.0.ebuild 931
 MD5 703344ac47772366ce5195c232876732 libgtkhtml-2.6.1.ebuild 937
 MD5 30db95792c9b2d9af7cd6ce78aa4d282 libgtkhtml-2.6.2.ebuild 941
-MD5 599457c472683cc3b43f1a23ad77befe libgtkhtml-3.0.10-r1.ebuild 1494
-MD5 8a94d18c414ee8ea5cf3a36034d38345 libgtkhtml-3.0.10.ebuild 1357
+MD5 a9ae5a3210e19aafd2aa7d89772d9746 libgtkhtml-3.0.10-r1.ebuild 1335
+MD5 f63b01a4d64590ec5792838ee4acc08b libgtkhtml-3.0.10.ebuild 1200
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e8efbc1eed003f5d595e842b7530c8bf libgtkhtml-3.2.2.ebuild 1164
-MD5 774e806049955bdcca5dba3535ecc237 libgtkhtml-3.2.3.ebuild 1166
+MD5 be4e5e188d0b5717ecfb74b88ba115ff libgtkhtml-3.2.2.ebuild 1092
+MD5 96fddd7609207b76af14163ea1ae08fa libgtkhtml-3.2.3.ebuild 1094
 MD5 c4945ff6d58733accdf9ff738ddc34b1 files/digest-libgtkhtml-2.4.0 69
 MD5 a5a0241e2812997e4266c6ba1df009ee files/digest-libgtkhtml-2.4.1 69
 MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
@@ -23,3 +26,10 @@ MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
 MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
 MD5 11d0e80cc10335bb6025b2b270cb8bc4 files/digest-libgtkhtml-3.2.2 67
 MD5 100e54c4c0cff7ebf097652fd2276015 files/digest-libgtkhtml-3.2.3 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBfhlvRkyva5PS18kRAiJTAJ4/QQiOS13Tv/7VcvuS2jFbH/hZ2ACdFQww
+PPGiBwaDDGqD1DNrXnEjkaY=
+=U73Q
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
index 20f82626fb0c..24494081e781 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild,v 1.9 2004/10/08 14:19:44 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild,v 1.10 2004/10/26 09:31:15 liquidx Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils versionator
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
+MY_MAJ_PV=$(get_version_component_range 1-2)
+
 DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="3"
 KEYWORDS="x86 ~ppc sparc hppa alpha ~ia64 ~amd64"
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild
index 9ec10b6a144f..af030cd1d08c 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild,v 1.14 2004/08/21 15:05:32 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild,v 1.15 2004/10/26 09:31:15 liquidx Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils versionator
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
+MY_MAJ_PV="$(get_version_component_range 1-2)"
+
 DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="3"
 KEYWORDS="x86 ppc sparc hppa alpha ia64 amd64"
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.2.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.2.ebuild
index 553e0730a7ee..600329a6e8fa 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.2.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.2.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.2.ebuild,v 1.2 2004/10/01 10:21:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.2.ebuild,v 1.3 2004/10/26 09:31:15 liquidx Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils versionator
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
+MY_MAJ_PV=$(get_version_component_range 1-2)
+
 DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
+SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.2"
 KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
index 4f142c95ec79..19354230fa68 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild,v 1.1 2004/10/16 19:07:53 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild,v 1.2 2004/10/26 09:31:15 liquidx Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils versionator
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
+MY_MAJ_PV=$(get_version_component_range 1-2)
+
 DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
+SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.2"
 KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"