Keyword amd64-linux and x86-linux, cleaning

Package-Manager: portage-2.2.01.21418-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 31 insertions, 119 deletions

diff --git a/sci-mathematics/pspp/ChangeLog b/sci-mathematics/pspp/ChangeLog
index 40fb9fc82d48..997dbf425698 100644
--- a/sci-mathematics/pspp/ChangeLog
+++ b/sci-mathematics/pspp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/pspp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.20 2012/05/21 06:56:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.21 2012/12/10 22:29:26 bicatali Exp $
+
+  10 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> -pspp-0.6.2.ebuild,
+  pspp-0.6.2-r1.ebuild:
+  Keyword amd64-linux and x86-linux, cleaning
 
   21 May 2012; Samuli Suominen <ssuominen@gentoo.org> pspp-0.6.2-r1.ebuild:
   Remove unnecessary gnome-extra/yelp from runtime dependencies;
@@ -97,4 +101,3 @@
   +pspp-0.4.0.ebuild:
   Initial import of pspp. Thanks to Torsten Kurbad <torsten@tk-webart.de> 
   for his work. Closes bug #79943.
-
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 934c3f42daa6..ade7d55d6559 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,23 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 50pspp-gentoo.el 171 RMD160 99882e34577c8209dafcd422e210af596bde5057 SHA1 c611390e4c21388b70d29dbc2a9a6f5eba41d8c2 SHA256 92296e81ab389b4c639a67cd015e19d63cf8e40664a95fc568c2c6b6e7608940
-AUX pspp-0.6.0-as-needed.patch 380 RMD160 320cd0f8d8ba96b0c8dfe8d745a49e45947f6e90 SHA1 2bfd20030a9702c6b2dff5e1f209995db0bd3d0a SHA256 4461de6c4109d85e7ec77d626bb39ac2ece904200412b77202184659bca048fc
-AUX pspp-0.6.2-gtk.patch 2166 RMD160 ddee329ca9f279ee0a245beb6ecdce4b55e1a182 SHA1 e41eb840dd4c64153dc737eac826729f792c7305 SHA256 6b983930e4081400b545f20e8109ee5b4137da229b587b56846bca1da4c125ef
-AUX pspp-0.6.2-no-test-pgsql.patch 388 RMD160 24cdc8ed39c74320f38c939731b4984befc4e121 SHA1 2c86a33c009e4c69975121db20524638059126c3 SHA256 70de6b53d9d82c478c82e8d44a9c0d2aca451792df92ea23c8931036a61e9512
-DIST pspp-0.6.2.tar.gz 3375748 RMD160 97667eb32b23a1bc7d18b7022649bd973ff01424 SHA1 c45f721a7ee82aede2106b77eade5e568c0930da SHA256 ec9639a3dcd3663b8007e600ab1a56291214334a9bba2e8d8c5a314509826385
-EBUILD pspp-0.6.2-r1.ebuild 2244 RMD160 e925f2d59ae70848134821ecac586044428e67fb SHA1 4186660e019906f49f44dcdc59ce919d01ae9bf8 SHA256 acd1ded8315aeea70ed56a86c72de6e1c7ab86e9bf6c516db5a5250858d33f23
-EBUILD pspp-0.6.2.ebuild 2172 RMD160 7b7092ddf55d917461ca692eb00ed1826c8e67da SHA1 96dd7237e42d717744dc731ca238904ade59d0b8 SHA256 eabf02b447d5f6ff315d38ae679ea204f92148932b646f88d39b84613b877b92
-MISC ChangeLog 3768 RMD160 d4e7bbbe3ade7f84c9af6143d9b6e5f4fcb84eac SHA1 ce000b6071e46f475b309cd22b79b7e7989a29a4 SHA256 b146b45e9ea1774e235f7bb97c8da131ca7f837a832733f376113852b8e21484
-MISC metadata.xml 603 RMD160 998f5cb118b3d461022936e556f7fee5894a37ea SHA1 4b355244b8a333e4b6b91abed55c619c41dd4f61 SHA256 699bb5fc8c9db7ef70683c986f3f120d541098edbf7a190f6f7becb13f52d436
+AUX 50pspp-gentoo.el 171 SHA256 92296e81ab389b4c639a67cd015e19d63cf8e40664a95fc568c2c6b6e7608940 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883 WHIRLPOOL b6193455db73c4cc90f4548179a77b8a10cbb8a3cdefede9834c4a4e4a9470d6e85474dbd411a8e0015d4b95f6c59574eff4036c7079bd1a1ad1c2c6aee7b482
+AUX pspp-0.6.0-as-needed.patch 380 SHA256 4461de6c4109d85e7ec77d626bb39ac2ece904200412b77202184659bca048fc SHA512 f8096fe3e926aff946039449bc30da94a54e84864ddb851a625a378f651fcd06a3ff6ff2d1464b06951ec3dc8c875fee376e452d911b9aa8a5ab8a9232839a7f WHIRLPOOL d9f51858b0c2ddaed40e3cac807ceba568f08b048b90430b864af032062b33022801873f590b5cc06ce0c3ef3a13d22af6511dec043bcda2af05be52f6f0c234
+AUX pspp-0.6.2-gtk.patch 2166 SHA256 6b983930e4081400b545f20e8109ee5b4137da229b587b56846bca1da4c125ef SHA512 59b017d5c9f38a38e80095289a6235b719cf7053f09b3595936026839afd37c8d75a6aab1442b0056055da3ef144886d1b5394e425c51000feab68d64330efbb WHIRLPOOL a2bd7c42e5b3f363b84cfc0711413ebbb2e11ce0795bfcf44b23e4e72b1b613b279bec252a5414dbb2e5e9f5684fad91c5597dd644075c79c397861b25621900
+AUX pspp-0.6.2-no-test-pgsql.patch 388 SHA256 70de6b53d9d82c478c82e8d44a9c0d2aca451792df92ea23c8931036a61e9512 SHA512 675ac283139bad3561ed7dd37d14fd9ca04ffaee0aef877130715a7427309035d35c19f947839cea8757086ee6106ff1f8d1c6e0c246c0c8c004496c8972c089 WHIRLPOOL 9676a89224528537a5e6f649fb569ce6e7a65c92b4a1c1e1792108cf85188acdb77618e5fd6cfbdaaaac52b216fcd3a8a1908f8258a67f3d6f84c2eead6376da
+DIST pspp-0.6.2.tar.gz 3375748 SHA256 ec9639a3dcd3663b8007e600ab1a56291214334a9bba2e8d8c5a314509826385 SHA512 0dfadb1fc5087ac0b076559902c08870ce1ad0111fdba23231c71954a675c6ba14b26e631b44cc9097a8c54c8530dba45d88165c6b428b47f1a636303989e84a WHIRLPOOL c0c9a6b2ed69059798c6b3710e39b8bfb697bd1693e6d6e6157cee8d173b2d7857ff76eaff7a78afb074e1b8c431dcdd1a5513c28abbbf31e4efe03728d69918
+EBUILD pspp-0.6.2-r1.ebuild 2280 SHA256 85f7d492b38063af42164aff007b3d36be0416b4cecb0b4ea726bd97d06b5d08 SHA512 b152bcdc031847b49fc3699c8074c881b08ea767012a3a61e97afb118ff746169105ff827f11cba0db3ac8bb1bf7e814f94deb4ba52a49e151e5fb73e183a20b WHIRLPOOL 31103f29d1fbb765b4dca20c67441ed2c7960a584a905354e7a01278bc523e65e16ef8cf4beb46ab35164bcd19a1177943a1caac8c4ff6155c98988eb3a39a79
+MISC ChangeLog 3912 SHA256 305cfc8eb68dfaa9bd3f01adceeddefab85e464b60bc8b773ef40cc9448c12cf SHA512 9a7993fbab896c2dd0f0a1344124a412497793b8c2e527e8076338f5627c09e1971f0774035d18e760e0e1b172faee2662eb9c96921faac2d62ec2f86252bfe1 WHIRLPOOL a1e2d7a2e48e16c16c7a262b56c2d4226558c672c1c5a5ecc7c8ee50295336020a18ea968a278ef8d42633748442b70fc2f365ab881b46d0694566282fc795d2
+MISC metadata.xml 603 SHA256 699bb5fc8c9db7ef70683c986f3f120d541098edbf7a190f6f7becb13f52d436 SHA512 6805deeda19892da0100515f49f2b3c2f156224bc3f9b054774e74e906118cbe7a13c1c28134fc7b4ee33e38e2db46b6b9c861bea01978ae7fe4183ff8a05837 WHIRLPOOL 0b64c96a4b254cd340a76076a8ac857a39d02c7f2b6b14d7fc43770e6e0f44089de11c5ee7afec6e62a13308d2816ddc8db9f14de1b947b7eaceca9764590656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPueZlAAoJEEdUh39IaPFNC7wH/jU7Nh+dJw9w9Pnvgp7SWWUm
-fC1BUTI5waDAH9IAQmXEqcTx0phikpdA+WQmHs/3jWnfUp9TrTWMKojiSo6dSomb
-735rGlywzHa4PA4wNWpqlBc1o8z5LFZuFEnvY+GypsXwVTYXO1RUMyWiMC73cwn4
-SzWaxXx/ivM9IjlCda5ErPAOnWEFnXRphbp6mWAtfbNFklyELNqLdbPLo1EeTav2
-WIHuIsLkfb5IHRZNMgjZZ7oYFtquQFJfxw1qBL4oYnoSHVmN+zG+icQVII3BXNcn
-QbNX7Y8Nj+LPKvkIc0+wNI0Gx8d/adlaJBI7nYRXwwRdNFdQQ8OThDjM/OgqIps=
-=uMFg
+iEYEAREIAAYFAlDGYkcACgkQ1ycZbhPLE2DctQCgkum9KAza8noS9qCAsxoa2IKz
+GtwAninA4n6iICWNtSYF4L7j/zaRryCC
+=n2nv
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild b/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild
index ec5d8195fbfc..22c3b97f218d 100644
--- a/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild
+++ b/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild,v 1.5 2012/05/21 06:56:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild,v 1.6 2012/12/10 22:29:26 bicatali Exp $
 
 EAPI=4
-inherit eutils elisp-common autotools
+inherit eutils elisp-common autotools multilib
 
 DESCRIPTION="Program for statistical analysis of sampled data."
 HOMEPAGE="http://www.gnu.org/software/pspp/pspp.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs gtk ncurses nls plotutils postgres static-libs"
 
-RDEPEND="sci-libs/gsl
+RDEPEND="
+	dev-libs/libxml2:2
+	sci-libs/gsl
 	sys-libs/readline
 	sys-devel/gettext
-	virtual/libiconv
 	sys-libs/zlib
-	dev-libs/libxml2:2
+	virtual/libiconv
 	emacs? ( virtual/emacs )
 	gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 )
 	ncurses? ( sys-libs/ncurses )
@@ -55,19 +56,20 @@ src_configure() {
 
 src_compile() {
 	emake pkglibdir="${EPREFIX}/usr/$(get_libdir)"
-	use doc && emake html && emake pdf
+	use doc && emake html pdf
 	use emacs && elisp-compile *.el
 }
 
 src_install() {
 	emake pkglibdir="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS ONEWS README THANKS TODO
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-	if use doc; then
-		doins -r doc/pspp.html doc/pspp-dev.html
-		doins doc/pspp.pdf doc/pspp-dev.pdf
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
 	fi
+	use doc && dohtml doc/pspp.html doc/pspp-dev.html && \
+		dodoc doc/pspp{,-dev}.pdf
 	if use emacs; then
 		elisp-install ${PN} *.el *.elc
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
diff --git a/sci-mathematics/pspp/pspp-0.6.2.ebuild b/sci-mathematics/pspp/pspp-0.6.2.ebuild
deleted file mode 100644
index 9caf0f179b46..000000000000
--- a/sci-mathematics/pspp/pspp-0.6.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.6.2.ebuild,v 1.8 2012/05/04 07:46:50 jdhore Exp $
-
-EAPI=2
-inherit eutils elisp-common autotools
-
-DESCRIPTION="Program for statistical analysis of sampled data."
-HOMEPAGE="http://www.gnu.org/software/pspp/pspp.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs gtk ncurses nls plotutils postgres"
-
-RDEPEND="
-	sci-libs/gsl
-	sys-libs/readline
-	sys-devel/gettext
-	virtual/libiconv
-	sys-libs/zlib
-	dev-libs/libxml2:2
-	emacs? ( virtual/emacs )
-	gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 )
-	ncurses? ( sys-libs/ncurses )
-	plotutils? ( media-libs/plotutils )
-	postgres? ( dev-db/postgresql-server )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	# this patch is hacky, but should not be needed for 0.7
-	epatch "${FILESDIR}"/${PN}-0.6.0-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-0.6.2-no-test-pgsql.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		$(use_enable nls) \
-		$(use_with gtk gui) \
-		$(use_with ncurses libncurses) \
-		$(use_with plotutils libplot) \
-		$(use_with postgres libpq)
-}
-
-src_compile() {
-	emake pkglibdir=/usr/$(get_libdir) || die "emake failed"
-	if use doc; then
-		emake html || die "emake html failed"
-		emake pdf || die "emake pdf failed"
-	fi
-	use emacs && elisp-compile *.el
-}
-
-src_install() {
-	emake pkglibdir=/usr/$(get_libdir) DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS ONEWS README THANKS TODO
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-
-	if use doc; then
-		doins -r doc/pspp.html doc/pspp-dev.html || die
-		doins doc/pspp.pdf doc/pspp-dev.pdf || die
-	fi
-	if use emacs; then
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use gtk; then
-		doicon src/ui/gui/${PN}icon.png
-		make_desktop_entry psppire psppire ${PN}icon
-	fi
-}
-
-pkg_postinst () {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}