From 558dfe88df8bb0b1c89e8f592da33235fc9f4980 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Wed, 6 Jul 2016 23:22:31 +1000
Subject: kde-plasma/kwallet-pam: export explicit src_test

The default phase causes BUILD_DIR to be overwritten with an incorrect value,
breaking the multibuild configuration causing one build to not be installed.

Gentoo-bug: 588136

Package-Manager: portage-2.3.0
---
 kde-plasma/kwallet-pam/kwallet-pam-5.6.5-r1.ebuild | 95 ++++++++++++++++++++++
 kde-plasma/kwallet-pam/kwallet-pam-5.6.5.ebuild    | 91 ---------------------
 kde-plasma/kwallet-pam/kwallet-pam-5.7.0-r1.ebuild | 95 ++++++++++++++++++++++
 kde-plasma/kwallet-pam/kwallet-pam-5.7.0.ebuild    | 91 ---------------------
 4 files changed, 190 insertions(+), 182 deletions(-)
 create mode 100644 kde-plasma/kwallet-pam/kwallet-pam-5.6.5-r1.ebuild
 delete mode 100644 kde-plasma/kwallet-pam/kwallet-pam-5.6.5.ebuild
 create mode 100644 kde-plasma/kwallet-pam/kwallet-pam-5.7.0-r1.ebuild
 delete mode 100644 kde-plasma/kwallet-pam/kwallet-pam-5.7.0.ebuild

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.6.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.6.5-r1.ebuild
new file mode 100644
index 000000000000..18dcab74b264
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.6.5-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5 multibuild multilib
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+oldwallet"
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kwalletd-pam
+	net-misc/socat
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		)
+		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
+
+		kde5_src_configure
+	}
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
+
+pkg_postinst() {
+	check_dm() {
+		local good
+		if [[ -e "${ROOT}${2}" ]] ; then
+			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
+				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
+				good=true
+			fi
+			if use oldwallet ; then
+				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
+					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
+					good=false
+				fi
+			fi
+		fi
+		[[ "${good}" = true ]] && \
+			elog "    ${1} - ${2} ...GOOD" || \
+			ewarn "    ${1} - ${2} ...BAD"
+	}
+	elog
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
+	elog "List of things to make it work:"
+	elog "1.  Use standard blowfish encryption instead of GPG"
+	elog "2.  Use same password for login and kwallet"
+	elog "3.  A display manager with support for PAM"
+	elog "4.a Have the following lines in the display manager's pam.d file:"
+	elog "    -auth        optional        pam_kwallet5.so"
+	elog "    -session     optional        pam_kwallet5.so auto_start"
+	if use oldwallet ; then
+		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
+		elog "    -session     optional        pam_kwallet.so"
+	fi
+	elog "4.b Checking installed DMs..."
+	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
+	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
+	has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+	elog
+}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.6.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.6.5.ebuild
deleted file mode 100644
index 071301435607..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.6.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5 multibuild multilib
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+oldwallet"
-
-COMMON_DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kwalletd-pam
-	net-misc/socat
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		)
-		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
-
-		kde5_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
-
-pkg_postinst() {
-	check_dm() {
-		local good
-		if [[ -e "${ROOT}${2}" ]] ; then
-			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				good=true
-			fi
-			if use oldwallet ; then
-				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
-					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
-					good=false
-				fi
-			fi
-		fi
-		[[ "${good}" = true ]] && \
-			elog "    ${1} - ${2} ...GOOD" || \
-			ewarn "    ${1} - ${2} ...BAD"
-	}
-	elog
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
-	elog "List of things to make it work:"
-	elog "1.  Use standard blowfish encryption instead of GPG"
-	elog "2.  Use same password for login and kwallet"
-	elog "3.  A display manager with support for PAM"
-	elog "4.a Have the following lines in the display manager's pam.d file:"
-	elog "    -auth        optional        pam_kwallet5.so"
-	elog "    -session     optional        pam_kwallet5.so auto_start"
-	if use oldwallet ; then
-		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
-		elog "    -session     optional        pam_kwallet.so"
-	fi
-	elog "4.b Checking installed DMs..."
-	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
-	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
-	has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
-	elog
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.7.0-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.7.0-r1.ebuild
new file mode 100644
index 000000000000..18dcab74b264
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.7.0-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5 multibuild multilib
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+oldwallet"
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kwalletd-pam
+	net-misc/socat
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		)
+		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
+
+		kde5_src_configure
+	}
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
+
+pkg_postinst() {
+	check_dm() {
+		local good
+		if [[ -e "${ROOT}${2}" ]] ; then
+			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
+				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
+				good=true
+			fi
+			if use oldwallet ; then
+				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
+					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
+					good=false
+				fi
+			fi
+		fi
+		[[ "${good}" = true ]] && \
+			elog "    ${1} - ${2} ...GOOD" || \
+			ewarn "    ${1} - ${2} ...BAD"
+	}
+	elog
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
+	elog "List of things to make it work:"
+	elog "1.  Use standard blowfish encryption instead of GPG"
+	elog "2.  Use same password for login and kwallet"
+	elog "3.  A display manager with support for PAM"
+	elog "4.a Have the following lines in the display manager's pam.d file:"
+	elog "    -auth        optional        pam_kwallet5.so"
+	elog "    -session     optional        pam_kwallet5.so auto_start"
+	if use oldwallet ; then
+		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
+		elog "    -session     optional        pam_kwallet.so"
+	fi
+	elog "4.b Checking installed DMs..."
+	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
+	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
+	has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+	elog
+}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.7.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.7.0.ebuild
deleted file mode 100644
index 071301435607..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.7.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5 multibuild multilib
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+oldwallet"
-
-COMMON_DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kwalletd-pam
-	net-misc/socat
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		)
-		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
-
-		kde5_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
-
-pkg_postinst() {
-	check_dm() {
-		local good
-		if [[ -e "${ROOT}${2}" ]] ; then
-			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				good=true
-			fi
-			if use oldwallet ; then
-				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
-					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
-					good=false
-				fi
-			fi
-		fi
-		[[ "${good}" = true ]] && \
-			elog "    ${1} - ${2} ...GOOD" || \
-			ewarn "    ${1} - ${2} ...BAD"
-	}
-	elog
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
-	elog "List of things to make it work:"
-	elog "1.  Use standard blowfish encryption instead of GPG"
-	elog "2.  Use same password for login and kwallet"
-	elog "3.  A display manager with support for PAM"
-	elog "4.a Have the following lines in the display manager's pam.d file:"
-	elog "    -auth        optional        pam_kwallet5.so"
-	elog "    -session     optional        pam_kwallet5.so auto_start"
-	if use oldwallet ; then
-		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
-		elog "    -session     optional        pam_kwallet.so"
-	fi
-	elog "4.b Checking installed DMs..."
-	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
-	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
-	has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
-	elog
-}
-- 
cgit v1.2.3-65-gdbad