Remove old; make sure to use automake 1.11 for rebuilding as it fails with 1.12.

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

4 files changed, 18 insertions, 91 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 7c76971bfe18..12c9be94bac2 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.121 2012/05/22 18:27:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.122 2012/06/22 23:27:32 flameeyes Exp $
+
+  22 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> -opensc-0.12.2.ebuild,
+  opensc-0.12.2-r1.ebuild:
+  Remove old; make sure to use automake 1.11 for rebuilding as it fails with
+  1.12.
 
 *opensc-0.12.2-r1 (22 May 2012)
 
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index ec8ab887f942..14bea943c1da 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -9,24 +9,17 @@ AUX opensc-0.12.2-parallelinstall.patch 2132 RMD160 4b5401fa9840dca5fc4f78df3e3a
 DIST opensc-0.11.13.tar.gz 1513327 RMD160 cd900866e51cd64fa7c5a3287cd58193dec26528 SHA1 408b374286004c3df15ec17856f69fd4c2a1aceb SHA256 a9a42d6d51fb500f34248fcd0d4083c99d25bc5e74df60fe4efa19b5b4e6d890
 DIST opensc-0.12.2.tar.gz 1738553 RMD160 45504135db05fd404a357ebd8bea047c5c8604dc SHA1 8c34be52eb94025eb181c02b466223901bef744c SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675
 EBUILD opensc-0.11.13-r2.ebuild 1487 RMD160 161e2629d3c04fb30949d1c798ae985430bcd134 SHA1 3f4bd510e302354ce02c90a4f62e149d3296ed6b SHA256 f95cfe682685f53c1735b322f787daf45caf6f3adfd0c093b0ebeea40ac3a548
-EBUILD opensc-0.12.2-r1.ebuild 1932 RMD160 347f75e8376c819acf5872d7ef63061339b4d41e SHA1 790b73f32deb0a1e1f0f49b2b1539d91257abaef SHA256 57210f8782bd2000b6cb311bab6382474c8732f249bd3c84e495d40223d60aac
-EBUILD opensc-0.12.2.ebuild 1941 RMD160 b81b8df8cffd129fb1ed941516c64a944f904131 SHA1 f3171bd9c964695a98b219c41c41429533d1cc42 SHA256 9e519d03de9d2e7c4982b0f8495123874c11b20dc21eb6bab1ba405de73fe81f
-MISC ChangeLog 18325 RMD160 bb72edb5ea3b3abdc70ca5d9c4b11a8116bbfdb9 SHA1 d3014d77a52217152a5a605f963a94740324e0e0 SHA256 648a6e4e8bb414251c53b98a7e12bf4400939752964cb6ec1fef43b05e9c83ce
+EBUILD opensc-0.12.2-r1.ebuild 1955 RMD160 06c5c93fecc9330ebd4bf1d83158b0f21e5c5a5d SHA1 c968ca7680550934d40008f131f32b2bc3681618 SHA256 0aecd707510571f32151d6597499ef7b3b58ffa66185af9ed1d62e4d06f9a423
+MISC ChangeLog 18520 RMD160 60783a49c7de1d389839c3956ed409f20e07c789 SHA1 ea75c61c97a362427f4e2449e963a714d929ccb1 SHA256 c19ca37f52f117c04b91186ccf3ce5e88a24199bf568a52fec489f5292125cde
 MISC metadata.xml 1322 RMD160 c7e8d6ae1d7474f49a0a5167c046e26deefc67e1 SHA1 4834a5d29302898026b878aca75c51ccad4bde07 SHA256 4bc1d4fac5acdfea7a9ffd78a107b1a4cb2d1b0e62930367b7ded696604dc94e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPu9rlAAoJELEHsLL7fEFWHWEP/2oHiGDwbv04pzHnkozh8llI
-RNyIj/USrXkK88eipEdUUwFTf8MKf+85Jgxb8kS5aKPndtg1gui+T9gilsCXqthI
-KX82VvzVm4R3136iZuD+rTIVd2YgHZJtHiyPUGKRddxCbz581vnQnAkVAqLdDe5s
-pX+6AvTfDRq+8Yg4ppTOMZ8zmkw2G512QtMN51yezIQwKQ9Ir4OY488K45Ux80mI
-P1IdgzTQx5tgvLsE0VnOQqkoXx40w+cIPBEjn69wyUPB21kXQRV+rFP8Bqg9O0/f
-lk5eyxgStMaxX8u5TZFudtxOFQppqEqslpteg7gsbDJGpTmkLuUCYNKw0bg0aCs3
-z7BO69mAwAIOabdohJEIIUQrDg67/Uad2sO/qzm1/vLnBpBG7PqOPtzxgANRSvTy
-pWmH4Rl/o+MXret7K9zJkspX5g9+JbdTwzXLbW1TRIp2rcYBI2uWBIpqj4kk1ist
-pvx6igjsasMZhi2CtUTg4+cVQiPmfRFHQKbAUtiZ1IWV+oPFqjHaBOUTxpXwh33I
-vIoW3sxRHvzc69wVj+UJNMl/Bi11QNSApAWb3W+CviD9jhM5x65AR0CNSJmkEQwq
-i3HHVVYFdViSEsqPDVFUra58iPk10DbXBUIzOrswmCAfsI5vDv/r+/dcu9kSu3KD
-esY8lRTcK5fTOAvd5CC+
-=mqB7
+iQEcBAEBAgAGBQJP5P9vAAoJEBzRPIrUMBNCbP8H/0/twyA03LiWgojYMsb7+65m
+gKdcubdhlgzAQzNPdiTGnJB7+qiydDOt8sUGaGQ4FJeo3Xj8Fx9Ahdr4o2A+g0uE
+nBwNaO5YoiwNP/HqqBWlkkNDFHNOebgD1j7qpS/zYtc/AddOrnMsBqrK6SWjwcfs
+OvfryKIRVFiawFQ5SagKxOkWNZL8/MLNPKpWS3DBZoF+lQ4rqE3tojizwrcCbt8h
+8v+CsBD3KoLCXMAjlJWEkXZHFUBDbCARAJEx+oI0b5e96SDhfQpkqG6ItuclVCwN
+QVD60V6alXBUX4NBNPWjKCZZHLhtPbN1qPoCYUdj4SDS6fGMx0NNCXw+qp8CkY0=
+=KTTq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/opensc-0.12.2-r1.ebuild b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
index b33e2101a9a2..1c4e23a0577a 100644
--- a/dev-libs/opensc/opensc-0.12.2-r1.ebuild
+++ b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r1.ebuild,v 1.1 2012/05/22 18:27:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r1.ebuild,v 1.2 2012/06/22 23:27:32 flameeyes Exp $
 
 EAPI="4"
 
+WANT_AUTOMAKE=1.11
+
 inherit eutils autotools
 
 DESCRIPTION="Libraries and applications to access smartcards"
diff --git a/dev-libs/opensc/opensc-0.12.2.ebuild b/dev-libs/opensc/opensc-0.12.2.ebuild
deleted file mode 100644
index 60b6a962f2fe..000000000000
--- a/dev-libs/opensc/opensc-0.12.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2.ebuild,v 1.5 2012/05/13 22:13:29 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="http://www.opensc-project.org/opensc/"
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc libtool +pcsc-lite openct readline ssl zlib"
-
-RDEPEND="libtool? ( sys-devel/libtool )
-	zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline )
-	ssl? ( dev-libs/openssl )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct )
-	openct? ( !pcsc-lite )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.1-crossbuild.patch
-	epatch "${FILESDIR}"/${P}-parallelinstall.patch
-	eautoreconf
-}
-
-src_configure() {
-	# disable everything, enable selectively
-	local myconf="--disable-pcsc --disable-openct --disable-ctapi"
-
-	if use pcsc-lite; then
-		myconf+=" --enable-pcsc"
-	elif use openct; then
-		myconf+=" --enable-openct"
-	else
-		myconf+=" --enable-ctapi"
-	fi
-
-	# the configure script prefers libtool's libltdl over
-	# the native system's dlopen ... so we have to manually
-	# control the behavior to something a bit more sane
-	export ac_cv_header_ltdl_h=$(usex libtool) \
-		   ac_cv_lib_ltdl_lt_dlopen=$(usex libtool)
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
-		--disable-static \
-		$(use_enable doc) \
-		$(use_enable openct) \
-		$(use_enable readline) \
-		$(use_enable zlib) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete
-
-	dodoc ChangeLog
-}