Version bump, bug#524740, cleanup

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 17 insertions, 52 deletions

diff --git a/dev-libs/libassuan/ChangeLog b/dev-libs/libassuan/ChangeLog
index 3c2acfcbf2c8..9bbf4ec4e1bb 100644
--- a/dev-libs/libassuan/ChangeLog
+++ b/dev-libs/libassuan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libassuan
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libassuan/ChangeLog,v 1.120 2014/02/05 04:02:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libassuan/ChangeLog,v 1.121 2014/10/08 06:23:55 alonbl Exp $
+
+*libassuan-2.1.2 (08 Oct 2014)
+
+  08 Oct 2014; Alon Bar-Lev <alonbl@gentoo.org> +libassuan-2.1.2.ebuild,
+  -libassuan-2.0.3.ebuild, -libassuan-2.1.0.ebuild:
+  Version bump, bug#524740, cleanup
 
   05 Feb 2014; Mike Frysinger <vapier@gentoo.org> libassuan-2.0.3.ebuild,
   libassuan-2.1.0.ebuild, libassuan-2.1.1.ebuild:
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 3585523a4079..230d9ff4baf9 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libassuan-2.0.3.tar.bz2 529149 SHA256 bad5682374c76bcc0abb1a7a34c9557af6874a477500748e64a7d3def79cac1b SHA512 8a67d3e357b490e6c07ea475e55271d6e86354cac9d65c8271aeac264b027041c83c7a83a87abb4ebb860f2a603730af181f27dc77c6429d2eb7765b36d0d088 WHIRLPOOL aeca9acf645dea6b793f0509b9dc43498fed47f958514ece292bdad300784dee529160ad012bd3277d25150c6bf3aa70299be4687b8eb5c592538bbbbbae1575
-DIST libassuan-2.1.0.tar.bz2 537489 SHA256 a4c5bd3a0c2726e8bcc2ea8a3b15f7aae3bd92d4f85968f315fd3a75d101c267 SHA512 0bc0f115d54613a2b0f049475715ee15c4c276af9ea6ad54ccdeafb533208185bb07fad15da70f49831fb35fffe19801a6dcfa6695b05e0dd6f26c5ea80129b2 WHIRLPOOL fe0ea652c2721a05e8c0a78b421c5f9dbd582216a735272750dcbe6dbc1fa2822a0112cfdf3d023ed53e301d735835a4b75465d0773161a4e19e036378b91a14
 DIST libassuan-2.1.1.tar.bz2 538155 SHA256 23e2d67779b88e90d29fe1df6b157109f1c2a647d0f1b2a0f4295bb3c0b2039d SHA512 ab32da1fe8a5240866412214b26be54641efbdd67510c53bb40c46a051b4d03b81406ae2ff4dc2ef51e21a7278e3f1705fe12dca4bd4ebfef84e109dd86d599e WHIRLPOOL 3476c7a6032073f4276e9282b59878774726fcb1d76def51a92be76a75f5dca6ab8a621598e479557f1412e35d01d4fd83d5d2d9f1dc42bbb519e7dc0396de84
-EBUILD libassuan-2.0.3.ebuild 991 SHA256 9351d04dc5699ca0ea776ea60ec1de7814490f5c5fbde837739f73a7c09a3b3d SHA512 6bb4139e3e78bc635681992f4aa5d48e4c9c80e6de4a2a21fdd018b16ba7c3b6f9c282be954fdbf03d77dea82939170da9d18287f465e4a419c6a6ab80bdc2d7 WHIRLPOOL b7f9144cb5977599b6e2bfaa6ce455b9729aa2a0a801f147e174439d7779babfe7ffa81ea9bd43442a6b78bbfda68ddd44e20ed1ac1c71cb99b84ef125a9cbbf
-EBUILD libassuan-2.1.0.ebuild 991 SHA256 269805a2046be9f1e58747f0d49120df4c18ace8403050f4b15c7dd756675751 SHA512 e3974a899c32aa301c84167dca49167e73b35e990f5cd7e50ab04886ae2d4cd7c314121e1acbf90f7bae4c0014423ce971250622418e1a8b5e777b623b9da8ea WHIRLPOOL c18afbd00f3e02182e14a6038e7081b63cb6675613f0c116452e6d9f36da35912077a66b1bcf97f20395e0a250cf9c8ee602632fae8b1ab2a49e32e4fa48a843
+DIST libassuan-2.1.2.tar.bz2 516026 SHA256 39f8a7c9349aaaf7ccd937b90660153ec4d2d4df2465018754e5bcae5b1db77b SHA512 a45b1db8521f547eafbf4ddeaa5b1a19dd47be32e1b02103b2c46c0c86291ba2c2124c25151311a90bb2837f8e42fce7b61d9316606b3b19dbabafc57549386b WHIRLPOOL 99928abc5379f0eddf3e3e0d9536969503b2284bdea0040964a8ed072469df61652b906cbaf597234462e565cb60bd2495d772feec34b7c3330bc1416aa710c9
 EBUILD libassuan-2.1.1.ebuild 1006 SHA256 b57d95ed3959b975818d695e2b796720f82722c86df2b4df70db069761f965aa SHA512 84015a5e48b3cbbfd40d7c3c3498a465d518e2cbb95464a531a1fb3d81fd82db88cd59992cc3d1116381c0f5caa5dcb8d98b4c495d704bda5ad91e1d91e0b522 WHIRLPOOL e47c95b9c22c57b09ef6804c9c541a8594068307c15bc6609480aa73e461a63a43e783f60fbc5f486d87710178f8bafae2a5dfe6bf73de97d09b191e565ca8f9
-MISC ChangeLog 14129 SHA256 a39664f863f7ea80461a308bbfa1136227463e36ed7d14d6b7a426f14a113d35 SHA512 d02751f4866f1ea4e66dd5aafc960800b809735df3dd37c6a569eb2e81c783e309eb3358f7db405c468ebe54b8c004630bb878c9843b7406307ec68f81dec2f4 WHIRLPOOL 1837ae3689955cde4c6cd0982afd4aaf49f6bc7956edbf02b6fc054dd3cf7dc539e625305fa18923015fb2c2883efe568c5ba264497356bee0d549f809d974c4
+EBUILD libassuan-2.1.2.ebuild 1017 SHA256 ca3c88980d5656cb52642f1b749d7c94f9dbf3dca2b915b2578af84815bb99ab SHA512 4f5b0cbd636cf157708e8fa787f4b4556abfa84d75908ea208b5c941a0862fa22733955e865c684830e9d19298896ff39a822328e056b06a568f4695e7d5e2fe WHIRLPOOL 0b83ef0426d3210444d69a02b6eb440c214402514fae4f72ed3ad2d49be4b169323be66e69f4c3c928b261ebd7984f9643625736a5c53e2baf7a75e746d981b3
+MISC ChangeLog 14323 SHA256 7f984f2ea8169c4d623e526bf706fc3b8318b335b7f05d90095c829b7af9a45f SHA512 7d80f7d3512ef034d3ffa83f4c57f6ee1fbda54a4745197dc55011aeedcc64069e7d3f7d81eb2f3f133e61729845695df565eb8aa2a6279b97a1695b6d8e1c1b WHIRLPOOL 0b9d0922becd7a65c6413492c7a9c6059e831719ac7bca04b627b0074c5217c0a29a1335d0df874c7600c2f35d250643ae1f6fbffb025ba19031e88f955e1751
 MISC metadata.xml 781 SHA256 03c037cbf0f8adef225909f74103ac887511be510631373e014ed7fee8542d3a SHA512 dfe568aa8bdcdaacc1ff205108391e4ff5328d4a95f89f0b9b9af3e8c8fd474033c9656f1357ee634c0e2cdb66f265aabc176b1335e450d7e1cf1680233ec6f0 WHIRLPOOL c96f78bf21e990b3d230a3c6b3e4291fb533ffd2e414b98938303432c458d52fd8ec43c27c96d89527a7bb3a898e8f8de048c059a3591d114ec8ff81e0db0aa9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS8bftAAoJEPGu1DbS6WIApL4P/iqqAl5iHKVojbJaduoUs7Ln
-yUuSeUW8N1FaMuzitlZNIzH5PHoQ23qZ2GY3bqjW7RHydPeYlh8ecluMGxWDcRXk
-3e4enFTa0BntqDalYzcKzKXb/UdZh2e/WX41x/wDyYjGoj+v9ri4y+luMl2hOHnv
-nrOgPfO/WtqPkNzhzQwlpkCNFeSL/3JfJjbXnLsSOAP/r1Zu7ZPJu+Ebx0dxw0Vp
-ghhOwkhmN/SEKiQp7xbY+cdjsSCvdMW/f34THoXla5jFSQXySio0/01rtybVD4wD
-v1qnH4t50coBpezvkYT14smZS2AZ2azLkj3sLhlycAUgIt/Fbm4dFCk9DUjZciN0
-pEDyUbSICS3fYBhTs2c3zBwEnKU1CWUuXDgGt4pR7mXixaDxUsb33y3mKy7fh2Ej
-vpBqykccn4zC5cqwyztpWVJOHqg8tqH4u9xGxK5QhU1BQK67qAyDRuvzK/GLLu5j
-sb4ZUcITSt4vFLxSHZxl7AbN9jkmCz3NnF3wJb+2+1GMt6PkSFx96xj/BD2ysHAO
-/awHmWgWh7V7Y/jqD9Xj+3pXRWm6/xeaRct2zYa9rpo67Qf/B4Mp/oHMzvh3sESU
-ov09P5aeLA9jrQrgjnMbshGMhVLVgtESRN/vbkARqdX5O5pxwb5gf7DDHWNW8RED
-QUOFuDYMCVV0mOg/uaey
-=nX4M
+iF4EAREIAAYFAlQ02IIACgkQXYk9GL8g3FH72gEAovGv6tsJc7cfpKA/yMIHIzRy
+jCSI7WbgdnEI9pPd7QkA/3nGyblcU3RdOsHJXZxFRGplfs/Dth8ulK18O1yL/gNS
+=AFpR
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libassuan/libassuan-2.1.0.ebuild b/dev-libs/libassuan/libassuan-2.1.0.ebuild
deleted file mode 100644
index 28c1c39f96be..000000000000
--- a/dev-libs/libassuan/libassuan-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libassuan/libassuan-2.1.0.ebuild,v 1.13 2014/02/05 04:02:46 vapier Exp $
-
-EAPI=4
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	rm -f "${ED}"usr/lib*/${PN}.la
-}
diff --git a/dev-libs/libassuan/libassuan-2.0.3.ebuild b/dev-libs/libassuan/libassuan-2.1.2.ebuild
index 4b4ca155d5f0..97eeb2e3756b 100644
--- a/dev-libs/libassuan/libassuan-2.0.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libassuan/libassuan-2.0.3.ebuild,v 1.12 2014/02/05 04:02:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libassuan/libassuan-2.1.2.ebuild,v 1.1 2014/10/08 06:23:55 alonbl Exp $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="IPC library used by GnuPG and GPGME"
 HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"