fixed linguas as per bug #126336 thanks to Chris White. Version bumped cause I could. removed old prerelease

(Portage version: 2.1_pre7-r5)

6 files changed, 40 insertions, 28 deletions

diff --git a/app-arch/sharutils/ChangeLog b/app-arch/sharutils/ChangeLog
index d03080303068..a77b7900006b 100644
--- a/app-arch/sharutils/ChangeLog
+++ b/app-arch/sharutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/sharutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/ChangeLog,v 1.41 2006/02/26 08:43:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/ChangeLog,v 1.42 2006/04/11 21:12:43 dragonheart Exp $
+
+*sharutils-4.6.2 (11 Apr 2006)
+
+  11 Apr 2006; Daniel Black <dragonheart@gentoo.org>
+  -sharutils-4.6.1_pre4.ebuild, sharutils-4.6.1.ebuild,
+  +sharutils-4.6.2.ebuild:
+  fixed linguas as per bug #126336 thanks to Chris White. Version bumped cause
+  I could. removed old prerelease
 
 *sharutils-4.6.1 (26 Feb 2006)
 
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index a8f449fbc6c4..8e28c7f669ef 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8301654b66f37743e7cc22f26436ddc1 ChangeLog 7662
 RMD160 b5857c50fcb305987be57319854376c82504ca2d ChangeLog 7662
 SHA256 6e82c98ec4840ce0f4106f839b02a83d9f3c960bca57c1f323a683a0d0d666b1 ChangeLog 7662
@@ -19,6 +16,9 @@ SHA256 0a032518f03adf6d2953ceb5f9fbc7e2e8301fb8c08c61dbfd971fb52918dc8b files/di
 MD5 2b368d65f6d5ffc4ae3116c0cff0ed03 files/digest-sharutils-4.6.1_pre4 72
 RMD160 a75ecf4690ff9d4c31b8a03c8f70dafcf60dfc60 files/digest-sharutils-4.6.1_pre4 72
 SHA256 7f5e75d7301ec33c743e052b212a5525c28c733839b4a06e4a63a83cbd5fe39d files/digest-sharutils-4.6.1_pre4 72
+MD5 1687a0f3d718b394049083b036a22560 files/digest-sharutils-4.6.2 509
+RMD160 8bfdc7b6192a4e05f17326acb2c8e86c7ef4e1ff files/digest-sharutils-4.6.2 509
+SHA256 da190cd168f68b8b41875ead2b8d598c1a706f7b1901e354cedf88ccb36a61e1 files/digest-sharutils-4.6.2 509
 MD5 aeb2dc437bac48b13e8ebc1d632013ad files/sharutils-4.2.1-buffer-check.patch 2416
 RMD160 98fe20fd590ed09c843ced898acc7e35c65770fc files/sharutils-4.2.1-buffer-check.patch 2416
 SHA256 887d21b0b398124e40557b9adb05f045f65dc96667dc860e442ab30548c32359 files/sharutils-4.2.1-buffer-check.patch 2416
@@ -40,19 +40,15 @@ SHA256 42b5fb933a35b7fb6150b750cc18913bbd607c337ed14c278a4fe6a9adf5313c sharutil
 MD5 6719e6ff2d5d0f203dd385a59adf89eb sharutils-4.5.ebuild 775
 RMD160 76691f7402f986002b7427a649da19dd48a62813 sharutils-4.5.ebuild 775
 SHA256 3322eb34c0ad5ebf5adeccb17b3425e17f64334be1bb8413f9959895bcd39b0c sharutils-4.5.ebuild 775
-MD5 6f9c24aa3f7cbee3c4d8b93fbc8a8b98 sharutils-4.6.1.ebuild 1076
-RMD160 329aa5b6085ab1ace73389d217dac03349da1385 sharutils-4.6.1.ebuild 1076
-SHA256 0fbf75f105650f872fa432c9235918f51fbc8a14da6216c46d5a9d9220c1c1f7 sharutils-4.6.1.ebuild 1076
+MD5 d759f7d334a6beb6433d42b46f757a24 sharutils-4.6.1.ebuild 1098
+RMD160 efc806448a288234a89470cb58d250d858fcdee8 sharutils-4.6.1.ebuild 1098
+SHA256 3e598b62c787b89d6fc10089971598a18e0d03e1147ba3691fd871c4ce77e9fc sharutils-4.6.1.ebuild 1098
 MD5 58769d7dc7e2e68f1b8e839e8a681863 sharutils-4.6.1_pre4.ebuild 1065
 RMD160 5ad760d1443d692d6d6e4b68b4ac5b4f569045ef sharutils-4.6.1_pre4.ebuild 1065
 SHA256 d25e31abbb86f266d1ebf7865d437eef44e7f1b26cb0df5c54942c615b747ebd sharutils-4.6.1_pre4.ebuild 1065
+MD5 d759f7d334a6beb6433d42b46f757a24 sharutils-4.6.2.ebuild 1098
+RMD160 efc806448a288234a89470cb58d250d858fcdee8 sharutils-4.6.2.ebuild 1098
+SHA256 3e598b62c787b89d6fc10089971598a18e0d03e1147ba3691fd871c4ce77e9fc sharutils-4.6.2.ebuild 1098
 MD5 6e9706ede2bd6a3411c36490de4a2617 sharutils-4.6.ebuild 960
 RMD160 99f6c4303e6d10fe842073664ebf98cfe420501e sharutils-4.6.ebuild 960
 SHA256 76682fe2bb7207c0f5d16af838a203310ef17b687a13eef1c0a9eff360779b44 sharutils-4.6.ebuild 960
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHP0r2+ySkm8kpY0RAiK9AJ9W3vpX2S5kV28sHC3RTEl/9uLXaACguTx3
-K0Kqqrv7i09V0jl+QfR1PfE=
-=hLcn
------END PGP SIGNATURE-----
diff --git a/app-arch/sharutils/files/digest-sharutils-4.6.1_pre4 b/app-arch/sharutils/files/digest-sharutils-4.6.1_pre4
deleted file mode 100644
index dfcfb6f49fca..000000000000
--- a/app-arch/sharutils/files/digest-sharutils-4.6.1_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b690ce1b198c2593d0ac3f67fc9fb9d sharutils-4.6.1-pre4.tar.gz 817280
diff --git a/app-arch/sharutils/files/digest-sharutils-4.6.2 b/app-arch/sharutils/files/digest-sharutils-4.6.2
new file mode 100644
index 000000000000..8d07857ee6e1
--- /dev/null
+++ b/app-arch/sharutils/files/digest-sharutils-4.6.2
@@ -0,0 +1,6 @@
+MD5 334c4c412beb9ebff142230ff8cbc6ef sharutils-4.6.2-doc.tar.gz 661054
+RMD160 1ae0d247505f799e05341aae9b10e6e1d5633fa8 sharutils-4.6.2-doc.tar.gz 661054
+SHA256 50168b165fc1188e122196ba8ee5e87f9d9aedea6457906fcd15e1328401b321 sharutils-4.6.2-doc.tar.gz 661054
+MD5 8714665f1499efd06330fd69164ca80d sharutils-4.6.2.tar.bz2 628814
+RMD160 244c114c67cef432ba5e14b64103fb636adada59 sharutils-4.6.2.tar.bz2 628814
+SHA256 bbd3033dda0f5362ec68229ee4c12b2d1bd33f857045547e28c38def000026ec sharutils-4.6.2.tar.bz2 628814
diff --git a/app-arch/sharutils/sharutils-4.6.1.ebuild b/app-arch/sharutils/sharutils-4.6.1.ebuild
index 2b1ac8bb87bf..4fd004710f42 100644
--- a/app-arch/sharutils/sharutils-4.6.1.ebuild
+++ b/app-arch/sharutils/sharutils-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.6.1.ebuild,v 1.2 2006/03/19 06:41:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.6.1.ebuild,v 1.3 2006/04/11 21:12:43 dragonheart Exp $
 
 inherit autotools
 
@@ -21,6 +21,7 @@ DEPEND="sys-apps/texinfo
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
+	strip-linguas -u po/
 	econf $(use_enable nls) || die
 	emake || die "emake failed"
 }
diff --git a/app-arch/sharutils/sharutils-4.6.1_pre4.ebuild b/app-arch/sharutils/sharutils-4.6.2.ebuild
index a970ff6e1490..63f4ee34b8a2 100644
--- a/app-arch/sharutils/sharutils-4.6.1_pre4.ebuild
+++ b/app-arch/sharutils/sharutils-4.6.2.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.6.1_pre4.ebuild,v 1.1 2006/01/06 08:20:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.6.2.ebuild,v 1.1 2006/04/11 21:12:43 dragonheart Exp $
 
 inherit autotools
 
 MY_P="${P/_/-}"
 DESCRIPTION="Tools to deal with shar archives"
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
-SRC_URI="http://autogen.sourceforge.net/data/${MY_P}.tar.gz"
-#SRC_URI="mirror://gnu/${PN}/REL-${PV}/${P}.tar.bz2
-#		mirror://gnu/${PN}/REL-${PV}/${P}-doc.tar.gz"
+SRC_URI="mirror://gnu/${PN}/REL-${PV}/${P}.tar.bz2
+		doc? ( mirror://gnu/${PN}/REL-${PV}/${P}-doc.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="nls"
-#IUSE="nls doc"
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls doc"
 
 DEPEND="sys-apps/texinfo
 	nls? ( >=sys-devel/gettext-0.10.35 )"
 
+S=${WORKDIR}/${MY_P}
+
 src_compile() {
+	strip-linguas -u po/
 	econf $(use_enable nls) || die
 	emake || die "emake failed"
 }
@@ -29,8 +29,10 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	#if use doc; then
-	#	tar -zxf ${DISTDIR}/${P}-doc.tar.gz -C ${D}/usr/share/doc \
-	#		|| die 'documentation installation failed'
-	#fi
+	if use doc ; then
+		mv html_chapter/ html_node sharutils.html html_mono/ \
+			pdf/sharutils.pdf.gz "${D}/usr/share/doc/${PF}" \
+			|| die 'documentation installation failed'
+		rm "${D}/usr/share/doc/${PF}"/*/*.gz
+	fi
 }