Do not let mod_install delete symlinks as that is the job of portage.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 114 insertions, 7 deletions

diff --git a/sys-auth/bioapi/ChangeLog b/sys-auth/bioapi/ChangeLog
index 479c70ee1db0..86dd30922810 100644
--- a/sys-auth/bioapi/ChangeLog
+++ b/sys-auth/bioapi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/bioapi
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.9 2008/10/26 19:13:05 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.10 2009/03/08 19:49:11 vapier Exp $
+
+*bioapi-1.2.3-r2 (08 Mar 2009)
+
+  08 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/bioapi-1.2.3-no-delete.patch, +bioapi-1.2.3-r2.ebuild:
+  Do not let mod_install delete symlinks as that is the job of portage.
 
   26 Oct 2008; Markus Meier <maekke@gentoo.org> bioapi-1.2.3-r1.ebuild:
   amd64/x86 stable, bug #244447
diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest
index 11df8ad3ca47..07cb07d81efb 100644
--- a/sys-auth/bioapi/Manifest
+++ b/sys-auth/bioapi/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 AUX bioapi-1.2.3-enroll-ret.patch 278 RMD160 d07ae277ec29877f43f2cec7cddc14ecc8b1e159 SHA1 a8c408afc7ea6d8b3cd9faa1710a49ced84b9f19 SHA256 b98227cef30d4573728985758b9cd548b5fb1ac66cdb07b5c415ec7aadee7460
+AUX bioapi-1.2.3-no-delete.patch 504 RMD160 c3f082d78ca36d073f2a88c775bcef210b6a4718 SHA1 55da967033cb1d95a19ee73fb2b1ec6c1b292b61 SHA256 344304ebf2cd13e2cfff8d9ed526419e1adb6edb7da80007f9c05b5fea128a3d
 DIST bioapi_1.2.3.tar.gz 1634237 RMD160 5a5e93e7ffd7136527e713185d10857f8eda5e5c SHA1 6873e090c2ace1e3835837895b9cf172b9ef50ff SHA256 c780c0d2e0c676be50de8ff537653580dd5b27fe1478846d22a017e52c6b6c2e
 EBUILD bioapi-1.2.3-r1.ebuild 2158 RMD160 3be884518f6ca5fe632e973dd522b710ec5b85f5 SHA1 41a610fac2ca79c4b80bf31a4e4ad5b670085c9d SHA256 ccb8d5a950e196075ca5c328a92056eca916a047075c927db04de648f270bd89
-MISC ChangeLog 1572 RMD160 3f240499cae500e10785ede4c3cdbe9cd35eb039 SHA1 12b48b1abe920de7223992b14cefe46759d887e7 SHA256 be8cf1bbb6c2081b02d2470fa14a2f0e7ba6282bf3978d92e2b08ac53103ad7a
+EBUILD bioapi-1.2.3-r2.ebuild 2203 RMD160 d50f56c50d85d08a112c2452ae6d669eb08f4f8f SHA1 b1e5175f22b31ddd9d446f9a07ab2b9fc3fb85f9 SHA256 07bd6f444d4376cbfd5d8840497229ec181c8626f50f441cd7d206f35b3f7d18
+MISC ChangeLog 1792 RMD160 5ce95c6bf2cacbe258fb9f4714b42d96c1c6c43c SHA1 ac391191aa5a7bdeb294e091e9d2ff4bf18e2e99 SHA256 fba02eb070d87c8ef81735a29fd8404636ea77b4ea685b79ecd70d4cdfd5ca73
 MISC metadata.xml 252 RMD160 34a164bfc96b8845a8308e85a214d633284b763b SHA1 c3aabeacb7af064df74acfddbfda2ae0497ff8a5 SHA256 445ab0e7fb8f15ad8dea05dabee14ecc25c6b81bfb9a6213ff3d9ea81f759154
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkkiJ60ACgkQ67wieSYcaxflHwCguyqo9tqO9yQLIcEvHHAW6Itb
-bFAAn12EnCAejvso4RL+bJHjUdppQFOA
-=nUiu
+iEYEARECAAYFAkm0ITwACgkQn/5bYzqsSmGAUwCgtrus4hsotCpOxQVILSZgdyNI
+msQAoI0P3nP0jS8LZFWEN6fviTjE8fY2
+=yx54
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
new file mode 100644
index 000000000000..919439f07c29
--- /dev/null
+++ b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild,v 1.1 2009/03/08 19:49:11 vapier Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Framework for biometric-based authentication"
+HOMEPAGE="http://code.google.com/p/bioapi-linux/"
+SRC_URI="http://bioapi-linux.googlecode.com/files/${PN}_${PV}.tar.gz"
+
+LICENSE="bioapi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt3"
+
+DEPEND="qt3? ( =x11-libs/qt-3* )"
+
+S=${WORKDIR}/bioapi-linux
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654
+	epatch "${FILESDIR}"/${P}-no-delete.patch
+}
+
+src_compile() {
+	econf $(use_with qt3 Qt-dir /usr/qt/3) || die "./configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake SKIPCONFIG=true DESTDIR="${D}" install || die "install failed"
+	dodoc README
+	dohtml *.htm
+
+	# rename generic binaries
+	mv "${D}"/usr/bin/{,BioAPI}Sample || die
+	if use qt3 ; then
+		mv "${D}"/usr/bin/{,BioAPI}QSample || die
+	fi
+}
+
+pkg_config() {
+	mds_install -s /usr/$(get_libdir)
+	mod_install -fi /usr/$(get_libdir)/libbioapi100.so
+	mod_install -fi /usr/$(get_libdir)/libbioapi_dummy100.so
+	mod_install -fi /usr/$(get_libdir)/libpwbsp.so
+	use qt3 && mod_install -fi /usr/$(get_libdir)/libqtpwbsp.so
+}
+
+pkg_preinst() {
+	if [[ -e ${ROOT}/var/bioapi ]] && [[ ! -e ${ROOT}/var/lib/bioapi ]] ; then
+		einfo "Moving /var/bioapi to /var/lib/bioapi"
+		dodir /var/lib
+		mv "${ROOT}"/var/bioapi "${ROOT}"/var/lib/bioapi
+	fi
+}
+
+pkg_postinst() {
+	einfo "Some generic-named programs have been renamed:"
+	einfo "  Sample -> BioAPISample"
+	einfo "  QSample -> BioAPIQSample"
+
+	if [[ ${ROOT} == "/" ]] ; then
+		pkg_config
+	else
+		ewarn "You will need to run 'emerge --config bioapi' before"
+		ewarn " you can use bioapi properly."
+	fi
+
+	# XXX: this can't be correct ...
+	enewgroup bioapi
+	chgrp bioapi "${ROOT}"/var/lib/bioapi -R
+	chmod g+w,o= "${ROOT}"/var/lib/bioapi -R
+	einfo "Note: users using bioapi must be in group bioapi."
+}
+
+pkg_prerm() {
+	mod_install -fu libbioapi100.so
+	mod_install -fu libbioapi_dummy100.so
+	mod_install -fu libpwbsp.so
+	use qt3 && mod_install -fu libqtpwbsp.so
+}
diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-no-delete.patch b/sys-auth/bioapi/files/bioapi-1.2.3-no-delete.patch
new file mode 100644
index 000000000000..b5664d11ec3a
--- /dev/null
+++ b/sys-auth/bioapi/files/bioapi-1.2.3-no-delete.patch
@@ -0,0 +1,15 @@
+do not delete the installed symlink -- let the package manager handle that
+
+--- bioapi-linux/apps/mod_install/install.c
++++ bioapi-linux/apps/mod_install/install.c
+@@ -496,10 +496,6 @@
+ 							}
+ 							else if ( Action == INSTALL_ACTION_UNINSTALL )
+ 							{
+-/* Linux-Port: Added the Linux branch */
+-#if defined (LINUX) || defined (SOLARIS)
+-								DeleteFile(szDstPath);
+-#endif
+ 								printf( "Module uninstalled successfully.\n" );
+ 							}
+ 							else if ( Action == INSTALL_ACTION_REFRESH )