Hack configure to set dependency based on use flags, closes bug#156424, thanks to Mart Raudsepp for reporting

(Portage version: 2.1.1-r2)

4 files changed, 265 insertions, 1 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 808cdbc7c7ec..bcc8b5ccc5f7 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.33 2006/10/20 00:30:30 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.34 2006/12/02 17:23:42 alonbl Exp $
+
+*opensc-0.11.1-r1 (02 Dec 2006)
+
+  02 Dec 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/opensc-0.11.1-dep.patch, +opensc-0.11.1-r1.ebuild:
+  Hack configure to set dependency based on use flags, closes bug#156424,
+  thanks to Mart Raudsepp for reporting
 
   20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> opensc-0.10.1.ebuild:
   Stable on Alpha.
diff --git a/dev-libs/opensc/files/digest-opensc-0.11.1-r1 b/dev-libs/opensc/files/digest-opensc-0.11.1-r1
new file mode 100644
index 000000000000..652ec44c29a9
--- /dev/null
+++ b/dev-libs/opensc/files/digest-opensc-0.11.1-r1
@@ -0,0 +1,3 @@
+MD5 94ce00a6bda38fac10ab06f5d5d1a8c3 opensc-0.11.1.tar.gz 1263611
+RMD160 f4d78936b2684f2eec94ec5d300841dea4234e91 opensc-0.11.1.tar.gz 1263611
+SHA256 6c2285b6a838903e2da9d72e997d4f3f5a59c7a31d47c98f864b350b116d365c opensc-0.11.1.tar.gz 1263611
diff --git a/dev-libs/opensc/files/opensc-0.11.1-dep.patch b/dev-libs/opensc/files/opensc-0.11.1-dep.patch
new file mode 100644
index 000000000000..3a73a53935ce
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.11.1-dep.patch
@@ -0,0 +1,190 @@
+--- opensc-0.11.1.org/configure.in	2006-05-31 00:04:47.000000000 +0300
++++ opensc-0.11.1/configure.in	2006-12-02 19:10:35.000000000 +0200
+@@ -25,6 +25,7 @@ AC_SUBST(OPENSC_LT_AGE)
+ 
+ AC_CANONICAL_HOST
+ AC_PROG_CC
++PKG_PROG_PKG_CONFIG
+ AC_C_BIGENDIAN
+ 
+ dnl Check for some target-specific stuff
+@@ -59,6 +60,17 @@ case "$host" in
+ 	;;
+ esac
+ 
++dnl Enable/disable openct
++AC_ARG_ENABLE(openct,
++	AC_HELP_STRING([--disable-openct], [disable openct linkage. [[default=no]]]),
++	[ENABLE_OPENCT="${enableval}"],
++	[ENABLE_OPENCT="yes"])
++dnl Enable/disable pcsc
++AC_ARG_ENABLE(pcsc-lite,
++	AC_HELP_STRING([--disable-pcsc-lite], [disable pcsc-lite linkage. [[default=no]]]),
++	[ENABLE_PCSC_LITE="${enableval}"],
++	[ENABLE_PCSC_LITE="yes"])
++
+ dnl Options
+ AM_MAINTAINER_MODE
+ 
+@@ -194,14 +206,17 @@ AC_CHECK_HEADER([ltdl.h], [AC_MSG_RESULT
+    [ AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool]) ])
+ LIBS="$saved_LIBS"
+ 
+-PKG_CHECK_MODULES(OPENCT, [libopenct], [
+-	OPENCT_MSG=yes
+-	AC_DEFINE(HAVE_OPENCT, 1, [Have OpenCT libraries and header files])
+-	], [
+-	OPENCT_MSG=no
+-	])
+-AC_SUBST(OPENCT_CFLAGS)
+-AC_SUBST(OPENCT_LIBS)
++OPENCT_MSG=no
++if test "x${ENABLE_OPENCT}" = "xyes"; then
++	PKG_CHECK_MODULES(OPENCT, [libopenct], [
++		OPENCT_MSG=yes
++		AC_DEFINE(HAVE_OPENCT, 1, [Have OpenCT libraries and header files])
++		], [
++		OPENCT_MSG=no
++		])
++	AC_SUBST(OPENCT_CFLAGS)
++	AC_SUBST(OPENCT_LIBS)
++fi
+ 
+ AM_CONDITIONAL(HAVE_OPENCT, test "x$OPENCT_MSG" = "xyes")
+ 
+@@ -216,72 +231,75 @@ AC_SUBST(OPENSSL_LIBS)
+ 
+ AM_CONDITIONAL(HAVE_OPENSSL, test "x$OPENSSL_MSG" = "xyes")
+ 
+-PKG_CHECK_MODULES(PCSC, [libpcsclite], [
+-        PCSC_MSG=yes
+-	AC_DEFINE(HAVE_PCSC, 1, [Have PC/SC implementation])
+-        ], [
+-        PCSC_MSG=no
+-        ])
+-AC_SUBST(PCSC_CFLAGS)
+-AC_SUBST(PCSC_LIBS)
+-
+-case "$host" in
+-*-*-darwin*)
+-	if test -z "$PCSC_LIBS" -a -z "$PCSC_LIBS"
+-	then
++PCSC_MSG=no
++if test "x${ENABLE_PCSC_LITE}" = "xyes"; then
++	PKG_CHECK_MODULES(PCSC, [libpcsclite], [
+ 		PCSC_MSG=yes
+-		PCSC_CFLAGS=""
+-		PCSC_LIBS="-Wl,-framework,PCSC"
++		AC_DEFINE(HAVE_PCSC, 1, [Have PC/SC implementation])
++		], [
++		PCSC_MSG=no
++		])
++	AC_SUBST(PCSC_CFLAGS)
++	AC_SUBST(PCSC_LIBS)
++
++	case "$host" in
++	*-*-darwin*)
++		if test -z "$PCSC_LIBS" -a -z "$PCSC_LIBS"
++		then
++			PCSC_MSG=yes
++			PCSC_CFLAGS=""
++			PCSC_LIBS="-Wl,-framework,PCSC"
++
++			# overwrite autoconf cached variables, too.
++			ac_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set}
++			ac_env_PCSC_CFLAGS_value=$PCSC_CFLAGS
++			ac_cv_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set}
++			ac_cv_env_PCSC_CFLAGS_value=$PCSC_CFLAGS
++			ac_env_PCSC_LIBS_set=${PCSC_LIBS+set}
++			ac_env_PCSC_LIBS_value=$PCSC_LIBS
++			ac_cv_env_PCSC_LIBS_set=${PCSC_LIBS+set}
++			ac_cv_env_PCSC_LIBS_value=$PCSC_LIBS
++
++			# header files are included via PCSC/*
++			AC_DEFINE(PCSC_INCLUDES_IN_PCSC, 1, [Header files in PCSC subdirectory])
++			AC_DEFINE(HAVE_PCSC, 1 , [Have PC/SC implementation])
++		fi
++		;;
++	esac
+ 
+-		# overwrite autoconf cached variables, too.
+-		ac_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set}
+-		ac_env_PCSC_CFLAGS_value=$PCSC_CFLAGS
+-		ac_cv_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set}
+-		ac_cv_env_PCSC_CFLAGS_value=$PCSC_CFLAGS
+-		ac_env_PCSC_LIBS_set=${PCSC_LIBS+set}
+-		ac_env_PCSC_LIBS_value=$PCSC_LIBS
+-		ac_cv_env_PCSC_LIBS_set=${PCSC_LIBS+set}
+-		ac_cv_env_PCSC_LIBS_value=$PCSC_LIBS
+-
+-		# header files are included via PCSC/*
+-		AC_DEFINE(PCSC_INCLUDES_IN_PCSC, 1, [Header files in PCSC subdirectory])
+-		AC_DEFINE(HAVE_PCSC, 1 , [Have PC/SC implementation])
++	saved_LIBS="$LIBS"
++	saved_CFLAGS="$CFLAGS"
++	if test "x$PCSC_MSG" = "xyes"; then
++		CFLAGS="${PCSC_CFLAGS} $saved_CFLAGS"
++		LIBS="$PCSC_LIBS $saved_LIBS"
++		AC_TRY_LINK([
++	#include <stdlib.h>
++	#ifdef PCSC_INCLUDES_IN_PCSC
++	#include <PCSC/wintypes.h>
++	#include <PCSC/winscard.h>
++	#else
++	#include <winscard.h>
++	#endif
++		], [
++	SCardControl(NULL, NULL, 0, NULL, NULL);
++		], [
++			AC_DEFINE(HAVE_PCSC_OLD, 1, [old version of pc/sc-lite])
++		])
+ 	fi
+-	;;
+-esac
+-
+-AM_CONDITIONAL(HAVE_PCSC, test "x$PCSC_MSG" = "xyes")
++	LIBS="$saved_LIBS"
++	CFLAGS="$saved_CFLAGS"
+ 
+-saved_LIBS="$LIBS"
+-saved_CFLAGS="$CFLAGS"
+-if test "x$PCSC_MSG" = "xyes"; then
+-	CFLAGS="${PCSC_CFLAGS} $saved_CFLAGS"
+-	LIBS="$PCSC_LIBS $saved_LIBS"
+-	AC_TRY_LINK([
+-#include <stdlib.h>
+-#ifdef PCSC_INCLUDES_IN_PCSC
+-#include <PCSC/wintypes.h>
+-#include <PCSC/winscard.h>
+-#else
+-#include <winscard.h>
+-#endif
+-	], [
+-SCardControl(NULL, NULL, 0, NULL, NULL);
+-	], [
+-		AC_DEFINE(HAVE_PCSC_OLD, 1, [old version of pc/sc-lite])
+-	])
++	# check for reader.h
++	saved_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS $PCSC_CFLAGS"
++	AC_CHECK_HEADER(reader.h,
++		[AC_DEFINE([HAVE_READER_H], 1, [Define if pcsc-lite with reader.h exists])],
++		[AC_MSG_WARN([reader.h not found, install pcsc-lite 1.2.9-beta8 or later, or use PCSC_CFLAGS=... ./configure])],
++		[ #include <reader.h>])
++	CFLAGS="$saved_CFLAGS"
+ fi
+-LIBS="$saved_LIBS"
+-CFLAGS="$saved_CFLAGS"
+ 
+-# check for reader.h
+-saved_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS $PCSC_CFLAGS"
+-AC_CHECK_HEADER(reader.h,
+-	[AC_DEFINE([HAVE_READER_H], 1, [Define if pcsc-lite with reader.h exists])],
+-	[AC_MSG_WARN([reader.h not found, install pcsc-lite 1.2.9-beta8 or later, or use PCSC_CFLAGS=... ./configure])],
+-	[ #include <reader.h>])
+-CFLAGS="$saved_CFLAGS"
++AM_CONDITIONAL(HAVE_PCSC, test "x$PCSC_MSG" = "xyes")
+ 
+ dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
+ dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
diff --git a/dev-libs/opensc/opensc-0.11.1-r1.ebuild b/dev-libs/opensc/opensc-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..d5a2c4053368
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.11.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.1-r1.ebuild,v 1.1 2006/12/02 17:23:42 alonbl Exp $
+
+inherit eutils libtool autotools
+
+DESCRIPTION="SmartCard library and applications"
+HOMEPAGE="http://www.opensc-project.org/opensc/"
+SRC_URI="http://www.opensc-project.org/files/opensc/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="pcsc-lite openct"
+
+RDEPEND="dev-libs/openssl
+	sys-libs/zlib
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SINGLE_MSG="Applying libtool reverse deps patch ..." \
+		epatch ${ELT_PATCH_DIR}/fix-relink/1.5.0
+
+	epatch "${FILESDIR}/${P}-dep.patch"
+
+	AT_M4DIR="aclocal" eautoreconf
+}
+
+src_compile() {
+	# --without-plugin-dir generates a /no directory
+	econf \
+		--with-plugin-dir=/usr/lib/mozilla/plugins \
+		$(use_enable openct) \
+		$(use_enable pcsc-lite) \
+		|| die
+
+	emake -j1 || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	dodoc NEWS README
+	dohtml doc/*.{html,css}
+
+	insinto /etc
+	doins etc/opensc.conf
+}
+
+pkg_postinst() {
+	ewarn "If you are upgrading from < opensc-0.10.0, be advised"
+	ewarn "that some functionality that was previously provided"
+	ewarn "by opensc is now packaged separately."
+	ewarn "check out sys-auth/pam_pkcs11, sys-auth/pam_p11 and"
+	ewarn "dev-libs/engine_pkcs11 since you might need them."
+	ewarn "Also in case of an upgrade please remember to run"
+	ewarn "revdep-rebuild due to ABI breakage."
+}