Cleanup old ebuilds

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

4 files changed, 6 insertions, 195 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/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"
-}