fix QA bugs as per #149044, thanks vapier

(Portage version: 2.1.1)

2 files changed, 15 insertions, 13 deletions

diff --git a/dev-libs/openct/ChangeLog b/dev-libs/openct/ChangeLog
index 9f3173700d37..d8415c90f099 100644
--- a/dev-libs/openct/ChangeLog
+++ b/dev-libs/openct/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/openct
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/ChangeLog,v 1.25 2006/09/22 11:20:19 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/ChangeLog,v 1.26 2006/09/25 13:42:08 kaiowas Exp $
+
+  25 Sep 2006; Petre Rodan <kaiowas@gentoo.org> openct-0.6.9.ebuild:
+  fix QA bugs as per #149044, thanks vapier
 
 *openct-0.6.9 (22 Sep 2006)
 
diff --git a/dev-libs/openct/openct-0.6.9.ebuild b/dev-libs/openct/openct-0.6.9.ebuild
index 29a00c0747cd..6e94a8ab8193 100644
--- a/dev-libs/openct/openct-0.6.9.ebuild
+++ b/dev-libs/openct/openct-0.6.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.9.ebuild,v 1.1 2006/09/22 11:20:19 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.9.ebuild,v 1.2 2006/09/25 13:42:08 kaiowas Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="http://www.opensc-project.org/openct/"
@@ -11,7 +11,7 @@ SRC_URI="http://www.opensc-project.org/files/openct/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="usb"
+IUSE="usb udev"
 
 RDEPEND="usb? (	>=dev-libs/libusb-0.1.7 >=sys-apps/hotplug-20030805-r1 )"
 
@@ -39,16 +39,15 @@ src_install() {
 		newexe etc/openct_usb openct || die
 	fi
 
-	if [ -e ${ROOT}etc/udev/rules.d ]; then
+	if use udev ; then
+
 		insinto /etc/udev/rules.d/
 		newins etc/openct.udev 70-openct.rules || die
-	fi
 
-	if [ -e ${ROOT}etc/udev/scripts ]; then
 		exeinto /etc/udev/scripts/
-		newexe etc/openct_pcmcia || die
-		newexe etc/openct_serial || die
-		newexe etc/openct_usb || die
+		newexe etc/openct_pcmcia openct_pcmcia || die
+		newexe etc/openct_serial openct_serial || die
+		newexe etc/openct_usb openct_usb || die
 	fi
 
 	newinitd "${FILESDIR}"/openct.rc openct
@@ -60,8 +59,8 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ -e ${ROOT}/usr/lib/libopenct.so.0 ]] ; then
-		cp "${ROOT}"/usr/lib/libopenct.so.0 "${IMAGE}"/usr/lib/
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libopenct.so.0 ]] ; then
+		cp "${ROOT}"/usr/$(get_libdir)/libopenct.so.0 "${IMAGE}"/usr/lib/
 	fi
 }
 
@@ -77,7 +76,7 @@ pkg_postinst() {
 	einfo "You need to be a member of the (newly created) group openct to"
 	einfo "access smart card readers connected to this system. Set users'"
 	einfo "groups with usermod -G.  root always has access."
-	if [[ -e ${ROOT}/usr/lib/libopenct.so.0 ]] ; then
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libopenct.so.0 ]] ; then
 		echo
 		ewarn "Please run: revdep-rebuild --library libopenct.so.0"
 		echo