Cleanup old ebuilds

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

5 files changed, 10 insertions, 203 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index d5cc7e16030e..1946dd602f9c 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.135 2014/02/19 19:36:43 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.136 2014/02/19 19:39:59 alonbl Exp $
+
+  19 Feb 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/opensc-0.11.13+pcsc-lite-1.6.2.patch,
+  -files/opensc-0.11.13-overflows.patch, -opensc-0.11.13-r2.ebuild:
+  Cleanup old ebuilds
 
   19 Feb 2014; Alon Bar-Lev <alonbl@gentoo.org>
   +files/opensc-0.13.0-openssl.patch, opensc-0.13.0.ebuild:
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 199810de7d1d..6a308090c483 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX opensc-0.11.13+pcsc-lite-1.6.2.patch 2581 SHA256 de08b3a968068ed600aa172891be59f0bb0b8a432bc6eea8fcc99a405ee309f5 SHA512 1dd468f7653a3426d63481b9ee00157c854a56c35bb6a3da9958e3f39d7d36cc745e8aaeb88ed16b6617959ffb3a6d17f0e7297734e41890aac3c80cd994d58b WHIRLPOOL 9613a6d2bcd448be46d1a5c40abf92e7db658f39ec4b70047baff8dda96bd31174e1a24607c0521c3b9608f819a6d30ba9bee32327badd17d8403c898b361cb7
-AUX opensc-0.11.13-overflows.patch 2463 SHA256 fd2071a803ed34ec961ab7a4dcddedaf00180e2fc54a1b53f9af945f2960c921 SHA512 09f459a2f6fafae131b5ad43500958682f22587b418aa1922939f38ceecbc90810903d0bf20788c484bf23e2e6ebe879e00a94bb7c334af65cb31fe01d6bcfb3 WHIRLPOOL bb5c75a3e5db86863ff0d60d4d3c8a3ae5a42531310054daeea7bb02f785755d148be00dbe61bea0b3af8d37c489316806cf0a274e0fde63230c32b3e956e3ac
 AUX opensc-0.12.1-crossbuild.patch 1839 SHA256 dd1f76f60d6223fc86ee80f500b89ffc3dfebffac04ef999f58df17d90b1bedb SHA512 92f3a9c396082e7ab133c3eedd2a672d1de716ae420f255efa1a5b81877cf598d971fc5f4f32ffe5c89b8c447657c1845528b5932d520c435eb440d077805fda WHIRLPOOL 118ee84e436c37b1307c0e74245a325c75504357363877db85085179707ff035fae6cd02755d58db12d3eef31ebcfbc0bb08994c0f814ea11d1bc787a69ad9c7
 AUX opensc-0.12.2-dl.patch 1264 SHA256 6d081c0c598b0999fad501ba97f293156d5a64928d769891c18cb6783e01da71 SHA512 90c1cd6e7fdb03a26ad031bd1b7bd7490d9cd890d3862d39b6929cea5ded393a43e86e2e364f492346d049b6d9eb58e6868561d2dcca4314084ef112bee43a16 WHIRLPOOL 3fab99f52ee034ebdb841c4dc30ca0b115f0b975b48150a49a4b89c38a2426287bc10b6bec9d105dac144d124acfc070de6e281c6ddde95f31d95bbd38c25d5e
 AUX opensc-0.12.2-parallelinstall.patch 2249 SHA256 70d94889f3443f1b8b303f6adb7755c2cb23610446fb0ebc8888e9cd36d17957 SHA512 dc632d0e97485708c825912f231db98edefdbadf71c37af2258b9f26cc7378fa4c8b1b4d6981c546b0e86bfc28615a5830c59f08fdf6ff995f110abccf3a54ae WHIRLPOOL aa9eff0174e6419a484448daed8e62282b538c67d21f572e66159558838d24229f10cbaf1f775d66ea69ec67a3ab28e611c1071f26372b97532d48918c932c84
 AUX opensc-0.13.0-openssl.patch 963 SHA256 6a61d3fc4750026a15ec6e2a4594ab8123e748f40e79f08622c646f13f6ddbc7 SHA512 a1108f404f5ceb87808d9be7dfff4391152d5d3d4f63946f56946c31d78b5a521f3d916ed5e8b76019560817812dceeb6aff0020904dddaaf13fe87fc7e43f76 WHIRLPOOL 3e0e6a126540fe053321f268c2489709ca0f1abf2bd759000c5315c655666bae2ea9a9bd1ef7ae835f9708dbdb806a1e551619cd25d64ac62353aad5fc492070
-DIST opensc-0.11.13.tar.gz 1513327 SHA256 a9a42d6d51fb500f34248fcd0d4083c99d25bc5e74df60fe4efa19b5b4e6d890 SHA512 f999c3cbcf99789578570bb77f4ae37efdc75fc516bdc1eae8f282bd57acc7f0a36dcba0fec98e53515064139dac2b3972fafdbfd09f19e1d2bd71030d021a99 WHIRLPOOL b33a68ca8f717d82553d9a7705ed97e1faf28fccae6362ca845af03824604812b35725d5c88457292ccf9e299cd133a22656e14f89334f5a427424e1c90ca72c
 DIST opensc-0.12.2.tar.gz 1738553 SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675 SHA512 544971f2c79723f618806c7043f0f1ffc25332752cbcaec97ffb1c99f9a2dff2237a6e5f5e020a4b9878921fec3a5234ca7e4fe9c8175c3f6142b169fcc65334 WHIRLPOOL 4969811d68d72e82c3a2b0297d5ff9aaca083b6ef8e66223d4385dce35cd9560cdda7cca8ccd38b52eb55465dbd6f8704485778b21d2a88bb548a5bbd87071e2
 DIST opensc-0.13.0.tar.gz 1946899 SHA256 abde46ae53b12b3273e40c532ffd4f7d423a51e0919a5234761453c17c089b14 SHA512 2d33088ff208f6a492dea896a0c0ccbf79b21bbcd953eb89cc7659fd60feb3e9258c2cdbb3112c30b16c3b4ef5bcfc914e0c3783894ac0b119a67116c1703a51 WHIRLPOOL 25934d790f3f855136aac263a49c0d49b604b748b9bad9f7de62d3781f37dc3e318c7fa9a20280fe7ca806ad6ea8d9ec104ba9a8a45b82237039fd965777d6e8
-EBUILD opensc-0.11.13-r2.ebuild 1487 SHA256 f95cfe682685f53c1735b322f787daf45caf6f3adfd0c093b0ebeea40ac3a548 SHA512 0d2da6d1bf06c6b798ecc38bccfd600f51d99d7865245e7720ff2bf0069efcb540fe5538672fe4fa97aecd30c7441bd315bec772a9fb5892d84601cc2a64d647 WHIRLPOOL 222461c33e9a94bcb424461b638b35cce79c9b1dde32eb485607272835c7b79eca4c4ca338e7d849ef10ccfcce6ef5916aa4a9636630352f81d6b050700d8442
 EBUILD opensc-0.12.2-r2.ebuild 1949 SHA256 260261e276bf1f55132381710630c6821eeef3534ab9e75a578a556594a834e5 SHA512 7b063a0a7031d30cfa27448a395efc3b12b402f60ab76355a085e41837aab9136500e2aaa9e6713a1e0bff2a9eb6e14d3f7f3d2d95d27f91f3e78a0cf356047e WHIRLPOOL 84cb1771ae4c7aa6d316876f0fc3552e0a6b26a30a270c20cdcd9b7974fd975b6cd7f30b63a814bb0afb682cff1847099994cd9b71de6358091622480c214922
 EBUILD opensc-0.13.0.ebuild 1481 SHA256 ed246c68adcd3e6057a6d674a9f724d96d5a0359c1b8b7100ab9cf5478ee64c4 SHA512 dc5272cc71356c7633015a9eb418aa0c3c7136c86eebdfa397d75297164308f9fd2929c9641bcef47616627250dc55f4e836535ae437db31b6b7daac0275a97b WHIRLPOOL 5c0ecae2eb320146af05a4acd649661c9862f5071488fc865631a3b48477d65e68fda15964054b3e708940654cf8f11e9db7ba91ef4b3540031301a7830f9a82
-MISC ChangeLog 20231 SHA256 d08aa1f3df0f1997bcdc4574cce6f5c1d64b0908678ebef2ffb53ad182f182c2 SHA512 6e15eafdbb0e485b1e58bd7bd14ad853c5124e99ae5120cc38ba5d23f08580657a06116b43982b915dc35671ae87b27ea7fc207effb8efe62391fca3037e1e54 WHIRLPOOL 6b8fee2a22d190c39dc4aeb45846bdfbcde8942a1a2420fb2bc3195b95bd905f52ca5130002a34cf1ef895cc9b129675f6e56d40238bbc5e3045cb2b654141f6
+MISC ChangeLog 20417 SHA256 706d51cfbf3525f3684cd111797add2f90ea7f62fb1ac4a34f5975765ffe8837 SHA512 f2d6a08e9330d175e295802bcc30774d7db6342075dec322169dcb597e3b238ad39c346b664c6a47b072a983c104be8108d541898d822da01c38d90dc075056a WHIRLPOOL cb4467231f551824f4c2bee86a8a1929e1462ccd6dd3037d3a8adda333f94cbb919aea5e44589cc32be0e08e47dc5512e9b1e735a159fe7738f454f8545fe234
 MISC metadata.xml 1210 SHA256 d4083d49ca45196e8650f6fc7900ba1569eaea7aecbf940425473ff6c339bc4c SHA512 5ea60e9893d894ef225d47d60b4381936734221566c346ca53f6df3be5936d45187ab5e8d5b8ffc1a1a090c48ea9ace3fded309e2972358c98fc498effa1f0df WHIRLPOOL 1c9acf6a9bd7ed2c6b3a563095d10d935bddb0cec867efed873fcc4793e13ffb5eeb3eb008b84dd5dd15eb849ad428f81281ca402a19c351e9d72c55e43f5c58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMFB9gACgkQXYk9GL8g3FF6vwD9EQt6ogvtt8/MyMuVfJO6MWmZ
-LGKb1bU7IzDWcRSkzxAA/RAXUq6YuDmrqdXM/0g0lWfARNK/vh2vIFgpMrtz1AFj
-=RBNu
+iF4EAREIAAYFAlMFCJkACgkQXYk9GL8g3FFyYAD/WMt8MKTJ8Tp414sEM7lYMsw3
+yKt5TDaZpgaG1anau4EA/33/S36jn63HodmNBHW/wDK/cQR3gqyHneKOCMmM6Bqc
+=vIev
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch b/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch
deleted file mode 100644
index 1cac75e8a15d..000000000000
--- a/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: opensc-0.11.13/src/libopensc/internal-winscard.h
-===================================================================
---- opensc-0.11.13.orig/src/libopensc/internal-winscard.h
-+++ opensc-0.11.13/src/libopensc/internal-winscard.h
-@@ -77,7 +77,7 @@ typedef struct
- 	unsigned long cbAtr;
- 	unsigned char rgbAtr[MAX_ATR_SIZE];
- }
--SCARD_READERSTATE_A;
-+SCARD_READERSTATE;
- 
- typedef struct _SCARD_IO_REQUEST
- {
-@@ -87,8 +87,8 @@ typedef struct _SCARD_IO_REQUEST
- SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST;
- 
- typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
--typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A,
--	*LPSCARD_READERSTATE_A;
-+typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE,
-+	*SCARD_READERSTATE;
- 
- #endif	/* HAVE_SCARD_H */
- 
-@@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact
- typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen,
- 	LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen);
- typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout,
--	LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders);
-+	SCARD_READERSTATE *rgReaderStates, DWORD cReaders);
- typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength,
- 	LPVOID pbRecvBuffer, LPDWORD lpBytesReturned);
- typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer,
-Index: opensc-0.11.13/src/libopensc/reader-pcsc.c
-===================================================================
---- opensc-0.11.13.orig/src/libopensc/reader-pcsc.c
-+++ opensc-0.11.13/src/libopensc/reader-pcsc.c
-@@ -80,7 +80,7 @@ struct pcsc_private_data {
- 
- struct pcsc_slot_data {
- 	SCARDHANDLE pcsc_card;
--	SCARD_READERSTATE_A reader_state;
-+	SCARD_READERSTATE reader_state;
- 	DWORD verify_ioctl;
- 	DWORD verify_ioctl_start;
- 	DWORD verify_ioctl_finish;
-@@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader
- 	sc_context_t *ctx;
- 	SCARDCONTEXT pcsc_ctx;
- 	LONG ret;
--	SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS];
-+	SCARD_READERSTATE rgReaderStates[SC_MAX_READERS];
- 	unsigned long on_bits, off_bits;
- 	time_t end_time, now, delta;
- 	size_t i;
-@@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader
- 	/* Wait for a status change and return if it's a card insert/removal
- 	 */
- 	for( ; ; ) {
--		SCARD_READERSTATE_A *rsp;
-+		SCARD_READERSTATE *rsp;
- 
- 		/* Scan the current state of all readers to see if they
- 		 * match any of the events we're polling for */
diff --git a/dev-libs/opensc/files/opensc-0.11.13-overflows.patch b/dev-libs/opensc/files/opensc-0.11.13-overflows.patch
deleted file mode 100644
index 3b83e2d45f37..000000000000
--- a/dev-libs/opensc/files/opensc-0.11.13-overflows.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/src/libopensc/internal.h
-+++ b/src/libopensc/internal.h
-@@ -49,6 +49,13 @@ extern "C" {
- #define sleep(t)	Sleep((t) * 1000)
- #endif
- 
-+#ifndef MAX
-+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
-+#endif
-+#ifndef MIN
-+#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-+#endif
-+
- struct sc_atr_table {
- 	/* The atr fields are required to
- 	 * be in aa:bb:cc hex format. */
---- a/src/libopensc/muscle.c
-+++ b/src/libopensc/muscle.c
-@@ -31,13 +31,6 @@
- #define MSC_DSA_PUBLIC		0x04
- #define MSC_DSA_PRIVATE 	0x05
- 
--#ifndef MAX
--#define MAX(x, y) (((x) > (y)) ? (x) : (y))
--#endif
--#ifndef MIN
--#define MIN(x, y) (((x) < (y)) ? (x) : (y))
--#endif
--
- static msc_id inputId = { { 0xFF, 0xFF, 0xFF, 0xFF } };
- static msc_id outputId = { { 0xFF, 0xFF, 0xFF, 0xFE } };
- 
---- a/src/libopensc/card-acos5.c
-+++ b/src/libopensc/card-acos5.c
-@@ -138,8 +138,8 @@ static int acos5_get_serialnr(sc_card_t * card, sc_serial_number_t * serial)
- 	/*
- 	 * Cache serial number.
- 	 */
--	memcpy(card->serialnr.value, apdu.resp, apdu.resplen);
--	card->serialnr.len = apdu.resplen;
-+	memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR));
-+	card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR);
- 
- 	/*
- 	 * Copy and return serial number.
---- a/src/libopensc/card-atrust-acos.c
-+++ b/src/libopensc/card-atrust-acos.c
-@@ -842,8 +842,8 @@ static int acos_get_serialnr(sc_card_t *card, sc_serial_number_t *serial)
- 	if (apdu.sw1 != 0x90 || apdu.sw2 != 0x00)
- 		return SC_ERROR_INTERNAL;
- 	/* cache serial number */
--	memcpy(card->serialnr.value, apdu.resp, apdu.resplen);
--	card->serialnr.len = apdu.resplen;
-+	memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR));
-+	card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR);
- 	/* copy and return serial number */
- 	memcpy(serial, &card->serialnr, sizeof(*serial));
- 	return SC_SUCCESS;
---- a/src/libopensc/card-starcos.c
-+++ b/src/libopensc/card-starcos.c
-@@ -1279,8 +1279,8 @@ static int starcos_get_serialnr(sc_card_t *card, sc_serial_number_t *serial)
- 	if (apdu.sw1 != 0x90 || apdu.sw2 != 0x00)
- 		return SC_ERROR_INTERNAL;
- 	/* cache serial number */
--	memcpy(card->serialnr.value, apdu.resp, apdu.resplen);
--	card->serialnr.len = apdu.resplen;
-+	memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR));
-+	card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR);
- 	/* copy and return serial number */
- 	memcpy(serial, &card->serialnr, sizeof(*serial));
- 	return SC_SUCCESS;
diff --git a/dev-libs/opensc/opensc-0.11.13-r2.ebuild b/dev-libs/opensc/opensc-0.11.13-r2.ebuild
deleted file mode 100644
index b940570fb717..000000000000
--- a/dev-libs/opensc/opensc-0.11.13-r2.ebuild
+++ /dev/null
@@ -1,59 +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.11.13-r2.ebuild,v 1.8 2012/05/04 18:35:51 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="SmartCard library and applications"
-HOMEPAGE="http://www.opensc-project.org/opensc/"
-
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc openct pcsc-lite readline ssl zlib"
-
-# libtool is required at runtime for libltdl
-RDEPEND="
-	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"
-
-pkg_setup() {
-	if use openct; then
-		elog "Support for openct is deprecated."
-		elog "It is recommended to use pcsc-lite."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.2.patch
-	epatch "${FILESDIR}"/${P}-overflows.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
-		$(use_enable doc) \
-		$(use_enable openct) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable readline) \
-		$(use_enable ssl openssl) \
-		$(use_enable zlib) \
-		--with-pinentry="/usr/bin/pinentry"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}