Keyword ~amd64 and ~x86, drop old.

Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64

4 files changed, 23 insertions, 43 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 666412788b16..a300efc06635 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libjpeg-turbo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.5 2011/01/05 13:56:45 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.6 2011/01/19 20:58:08 spatz Exp $
+
+  19 Jan 2011; Dror Levin <spatz@gentoo.org> -libjpeg-turbo-1.0.1.ebuild,
+  libjpeg-turbo-1.0.90.1.ebuild:
+  Keyword ~amd64 and ~x86, drop old.
 
 *libjpeg-turbo-1.0.90.1 (05 Jan 2011)
 
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 918f5cb15a17..9f63efa98b25 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,6 +1,18 @@
-DIST libjpeg-turbo-1.0.1.tar.gz 1297500 RMD160 08a83f029cd4fb62745cbdbece1d695b54cb6841 SHA1 5bbc4cbfcb3f5b8ebef6deb619d85b1577059619 SHA256 0effd8d28bfecfc6dacda80749d6ef34d24fcd897dfc7a20ac7fe1153fde9224
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST libjpeg-turbo-1.0.90.1.tar.bz2 1773512 RMD160 52af890e68316ee8ba41f72206d98a9951bc705f SHA1 0e2f4913e108ec4d042f1bb7916b3bc208511eff SHA256 47fae23c5ae63c13d587a4042f7cdb0d4b1f9eeeada37cc4993910cd246d5b52
-EBUILD libjpeg-turbo-1.0.1.ebuild 884 RMD160 4d14e0f85eb12b5d692a1a30f1263358a516c17f SHA1 ed10ef1cf2be6dc49c8911d61ab077d7b9511f05 SHA256 2052e527cd5a4954f24825cea9cd4123902e4721776bc00f41e659e2951afa38
-EBUILD libjpeg-turbo-1.0.90.1.ebuild 935 RMD160 19ce655472cb5a7c3f1ace711d8a98003c1b2d65 SHA1 dc7e669898f31fa9776891267a2a54e765f6b083 SHA256 f885aa6ff6d5fb38990be93a610594b999abb488d71e0c335dc8eb0e6f6c3acd
-MISC ChangeLog 1134 RMD160 df917394c3b1326a4b53bbc99b0fa8c7154ab4a3 SHA1 9ab8d9634b4f23fcec7a933eac115666ff6ff9ab SHA256 68a6fc28b205ce2eab11dba242e4f0d6054459a566b30f30b77d8abce9a2ca85
+EBUILD libjpeg-turbo-1.0.90.1.ebuild 942 RMD160 a87efc173e27231a4ce178bef93c720cb08aee2f SHA1 9ab1ebfc0b3bd2353a47e55cf4179b6dc0a702d4 SHA256 8f442f28766d0dd2c82a4148dd96e92144d903dcad02130be59092dc327f887f
+MISC ChangeLog 1277 RMD160 e76cf9bf0242fc882f45b9c873c3ddb5d6a74e00 SHA1 0323f7ddb3ff1d36cb554c3c20c920da734d82a4 SHA256 a893eb34475579bac19ee8d5f417cf1d4924a023512dfbd023e81039e3356f4a
 MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCgAGBQJNN1BsAAoJEAWF714uGAc6N30H+gOF7bJeHzkkI5TTNMjABOZZ
+I6fgqoyt/O94zgiM4DZWJGFhvaA4Ia1EWQJ4GQJ/67KkNrzgY+psMk6oANybcC17
+EeFAceakPzvt/08TbwBf3runKc/53YJMZXlC+MUOJLOlay0tS7old+7OY2ejMbF3
+is7exLnNyUVBFBMttf0ElSK0+Y7sGXU8YyUG4XgaHlvCBCtYUPAOWpnysJbyhKsD
+XboNQSObjuERN1/hvsGCm+KNGun3u2EE7lByIzx5ecrzhQshRa7j9M8XVzYz6FpR
+H7YJSFwWBIoAc79aGIc5iGGMo4n/jJTeQljnVGY4SfAV+lkfIEeSE5OMrK0V+HE=
+=uvKl
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.1.ebuild
deleted file mode 100644
index ff7f3189bcbb..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.1.ebuild,v 1.1 2010/09/20 17:57:09 ssuominen Exp $
-
-EAPI=2
-inherit libtool
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accellerated jpeg library"
-HOMEPAGE="http://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is LGPL-2.1 wxWinLL-3.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-
-RDEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-DEPEND="${RDEPEND}
-	dev-lang/nasm"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc BUILDING.txt ChangeLog.txt example.c README-turbo.txt *.doc
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90.1.ebuild
index 74fa392e56c0..5b6269996d07 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90.1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90.1.ebuild,v 1.2 2011/01/05 14:44:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90.1.ebuild,v 1.3 2011/01/19 20:58:08 spatz Exp $
 
 EAPI=2
 inherit autotools libtool
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~anarchy/dist/${P}.tar.bz2"
 
 LICENSE="as-is LGPL-2.1 wxWinLL-3.1"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="!media-libs/jpeg:0"