Stable for amd64, wrt bug #401599

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 24 insertions, 27 deletions

diff --git a/app-text/gsview/ChangeLog b/app-text/gsview/ChangeLog
index 1f0074adc9b8..b2e1243f65e8 100644
--- a/app-text/gsview/ChangeLog
+++ b/app-text/gsview/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/gsview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/ChangeLog,v 1.35 2012/01/30 23:38:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/ChangeLog,v 1.36 2012/01/31 14:41:29 ago Exp $
+
+  31 Jan 2012; Agostino Sarubbo <ago@gentoo.org> gsview-4.9.ebuild:
+  Stable for amd64, wrt bug #401599
 
   30 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> gsview-4.9.ebuild,
   +files/gsview-4.9-libdl.patch:
diff --git a/app-text/gsview/Manifest b/app-text/gsview/Manifest
index d2d7f4a826b5..2aa788141c76 100644
--- a/app-text/gsview/Manifest
+++ b/app-text/gsview/Manifest
@@ -8,23 +8,17 @@ AUX gsview-help 300 RMD160 477c846a3f0a47951dbcf2bb5006a14c33756c14 SHA1 85c0abb
 DIST gsv48src.zip 1481063 RMD160 c5bd8ad82f8d5753b9ae72fda008c228aef4c18d SHA1 100a5d6ff4fd279d00395cd0bd896bbdd5f2dc4d SHA256 3a401dfe262370be802fe26a092b420ded1fd7d281c70406a3f32066baa8cf09
 DIST gsv49src.zip 1455372 RMD160 6f1b9fb2bdccdfb38a584ec1cd14324b9b60eb23 SHA1 036d13b5ff82bcd0150d440e2517c965a952ee49 SHA256 37829125d90957bb66e9b1bc71bff64f9da3553dc8fcf6078944269b3202b78d
 EBUILD gsview-4.8.ebuild 1344 RMD160 ddc78dc9183a57ffb0e61f2514a2dbf481868780 SHA1 f6cc0dfefc868f4853b99626ed9ad0f0433fa4b0 SHA256 525d97c273ef7da4574981a8ce0fcbcac1851fc6d7c8703a1436b3afab0976e7
-EBUILD gsview-4.9.ebuild 1409 RMD160 5c34b21ad48c36d41222235e486717cbeb238a94 SHA1 ead174ad8e5f7a469244398395e43c2796ede1d4 SHA256 fd6ff1d6bc936832289fefe3251663ec290e9f6fc304337b15d7c61e3b69af2b
-MISC ChangeLog 4635 RMD160 60a0ce169cd701b8c0bb99fa2fdb051b6436172d SHA1 8a5870ec71ec762f37cd5bc548bfbae2a1f72e0c SHA256 0e68e8f68b50554a012d9d143c71488da9ab6fe0ba175713393b01fbec70d32c
+EBUILD gsview-4.9.ebuild 1465 RMD160 9dc485f392009c0c83f97868aff72b600b8958b2 SHA1 6317be0c12effd1bcf195536bc2b3dcd097b9386 SHA256 d12863e901c962668afeedccb6891781de11c068866db61b41ddd386c59c5c3f
+MISC ChangeLog 4734 RMD160 84b98298bc76b2b55a797e804d3078806ef9074b SHA1 63b1871d28e15b13daab86afba4140b77699c30a SHA256 561957878265a3060fb7a2f02981b4d759ec2acc35c3eb6cfd3bfea9e69706ac
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPJypkAAoJENwGBM22xffed8cP/3Xq8eRf4xlJT2k6sbHfA34+
-3p5iHC5pF2XLfdG1U6acc56IhNL5+NnnXzlugwXmz/7EFunFdQ9S3Y+kVnwnWvgY
-JxxkI7YBQGOkWNwI2G89W0QcRBg4H0TDEiRCUmEAqWDm/mBYfns+KyPVfdp9DUhh
-excIxA4XiTEvZFTtT9XfQv/mR+kPCTdI6HXeKF1Ayag6Dr8eQRbE6KtQpkbV52Gt
-6Ywq4lQpitSNb9kJe8RNBkSt5y6D2P1RdYXBcPUdmKMQ31iEbG++fl9gA/MyFuFx
-MMHpd+ithBUpx/EGJLW1NP168DcJRUYt3RcaPDnzumOrVhKEcrJ4ml8tfEuL/KZ+
-sOpoECgI3nYz8HfRWmoCVso2rIvo3ED9+Adc93TRiWiWn/W13F2tdZzyId4t+ZuO
-RNqTLO1mWqLWLRinkGMc3y+5mdKDqXCVsdJGW4A8ZZdeGdT8+l7aXqp7uWFKLDmN
-8kYa14om3aMaIBb2+vFSfYob6LgiPeZqjDsPFwTtXW2kKylDUDXcIx9VOwBmjYde
-RhAo5w0VcAPB4S5SAfQf5QdoUfmS+aPhPfu1MUn4wA9syzJupikRZ4920Wctmaz5
-84vpH2c04sP3Zmrxbvx2lXK6N4YTOfPjeisc84kfbxTkhL3XDoxfVHFAWNoQGIRr
-aB9i5mGnlRPUkhD6rJR7
-=3O/J
+iQEcBAEBCgAGBQJPJ/2fAAoJEOTDgjZ80txdnhcIAJ7CqDZrN3ZIZ95QoZnYAfmD
+dPshArPA+UCvUAjqW195mdaenYYV5EdMzVy4whinysTmQS0FZJJm68uzdVID/gKm
+2GdbdMrbNr6R/S2F6v9MjK5skjT+ztfY4zfuTJ8K0Sr/zIdyhthMmgVhqZVtkVOX
+MPCe8ZvT9qt5KNtM4aUvOuvJm+Ra5hVImUy/sDH5I/8Nd3zZFbgPZ7vXtOE/OR5a
+YGeOG+yCl8hMbI0jczAldDw0SgnXfmUuJMGot5ApkFNHUjHBFKU3coUxmRZhULjX
+npIB4bqtkDxIqa5KHlknHYIdhn91+qJY7TXWe2inAwortiyky141j8u/YGKrduU=
+=EBNW
 -----END PGP SIGNATURE-----
diff --git a/app-text/gsview/gsview-4.9.ebuild b/app-text/gsview/gsview-4.9.ebuild
index ab6861a7ea76..149fde24310e 100644
--- a/app-text/gsview/gsview-4.9.ebuild
+++ b/app-text/gsview/gsview-4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/gsview-4.9.ebuild,v 1.4 2012/01/30 23:38:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/gsview-4.9.ebuild,v 1.5 2012/01/31 14:41:29 ago Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsv${MY_PV}src.zip"
 IUSE="doc"
 SLOT="0"
 LICENSE="Aladdin"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/gtk+:1
 	app-text/epstool
@@ -31,11 +31,11 @@ src_prepare() {
 }
 
 src_compile() {
-	ln -sf srcunx/unx.mak Makefile
+	ln -sf srcunx/unx.mak Makefile || die
 
 	## respect CFLAGS
-	sed -i -e "s:^CFLAGS=-O :CFLAGS=${CFLAGS} :g" Makefile
-	sed -i -e "s:GSVIEW_DOCPATH:\"${EPREFIX}/usr/share/doc/${PF}/html/\":" srcunx/gvx.c
+	sed -i -e "s:^CFLAGS=-O :CFLAGS=${CFLAGS} :g" Makefile || die
+	sed -i -e "s:GSVIEW_DOCPATH:\"${EPREFIX}/usr/share/doc/${PF}/html/\":" srcunx/gvx.c || die
 
 	## run Makefile
 	# bug #283165
@@ -43,20 +43,20 @@ src_compile() {
 }
 
 src_install() {
-	dobin bin/gsview
+	dobin bin/gsview || die
 
-	doman srcunx/gsview.1
+	doman srcunx/gsview.1 || die
 
-	dodoc gsview.css cdorder.txt regorder.txt
+	dodoc gsview.css cdorder.txt regorder.txt || die
 
 	if use doc
 	then
-		dobin "${FILESDIR}"/gsview-help
-		dohtml *.htm bin/*.htm
+		dobin "${FILESDIR}"/gsview-help || die
+		dohtml *.htm bin/*.htm || die
 	fi
 
 	insinto /etc/gsview
-	doins src/printer.ini
+	doins src/printer.ini || die
 
 	make_desktop_entry gsview Gsview "" "Office" ||
 		die "Couldn't make gsview desktop entry"