Remove pam_console USE flag so that it's always disabled.

Package-Manager: portage-2.1.4_rc10

4 files changed, 25 insertions, 76 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index aec601bbe3b5..1997133770a6 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.187 2007/11/24 11:27:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.188 2007/12/20 15:45:36 flameeyes Exp $
+
+  20 Dec 2007; Diego Pettenò <flameeyes@gentoo.org> pam-0.78-r5.ebuild:
+  Remove pam_console USE flag so that it's always disabled.
 
   24 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> pam-0.99.9.0.ebuild:
   Don't suggest using sys-auth/pam_console anymore, also link the upgrade
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 7e17d410c8e3..03dcd1d7fa7d 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -26,12 +26,11 @@ DIST Linux-PAM-0.99.8.1-ldflags-to-libadd.patch.bz2 2556 RMD160 e15c0cccb05e32c5
 DIST Linux-PAM-0.99.8.1.tar.bz2 903827 RMD160 bac7908aebb4671bdf95d0c31086f2ed2d879ef8 SHA1 41ea4d3296cfd0f1709e8b250d5afd3c4e98ef8b SHA256 47abe93a4d451ff6403c04898d386fb568ba7578520c4cf2687122a12e286cd2
 DIST Linux-PAM-0.99.9.0.tar.bz2 909240 RMD160 824ff71efd5e4ea29a65462bcab08d41b583e8db SHA1 19876eee4890ec94bf81da8506d24c3762be8860 SHA256 606158db75d5a474ac52a8bd884e27cc2da13edb4e7bc7a1a2f39686cb5568d6
 DIST db-4.3.27.tar.gz 5921872 RMD160 711129871c7edd840184bd5a87fb7bf93c8bb953 SHA1 8fddfe98d5ff7fcdb3fe9e23bb361d8f20a35941 SHA256 6f09e04c5811ad72a2a5c99459340cb2c635e6553520af76fc9e717dd6207244
-DIST glib-2.6.5.tar.bz2 2357089 RMD160 6ccdfed7ea5621b7c69c436c3b8b5fbba44dc62e SHA1 82818f9173b0bdc2b26af018e8393eb76318552e SHA256 ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca
 DIST pam-0.78-patches-1.6.tar.bz2 91527 RMD160 af880422f7e0f6440debf6885a4e3ca048dc67a9 SHA1 47683aee7734495707e619c111b93e07bcac5d1f SHA256 54241417a9e19b02457b3d9997e6ca24c14da86e22d447873440853a7525c9bb
-EBUILD pam-0.78-r5.ebuild 11392 RMD160 a3113db4aed9cf36389abf8aca5aceeda5b9015c SHA1 bb2b0a02b57093ad11a5d0637a813ea1d1a194bb SHA256 4b6d70eb13e1dacad891c17df34f0bde0c1052c66dcc05af71b82520e88df207
-MD5 39b6c36443efa0a268f232c56e809bb1 pam-0.78-r5.ebuild 11392
-RMD160 a3113db4aed9cf36389abf8aca5aceeda5b9015c pam-0.78-r5.ebuild 11392
-SHA256 4b6d70eb13e1dacad891c17df34f0bde0c1052c66dcc05af71b82520e88df207 pam-0.78-r5.ebuild 11392
+EBUILD pam-0.78-r5.ebuild 9749 RMD160 ae9380771b6b831104d7c60d7ebbb7065d72a7b0 SHA1 ad6d842d3f69cecd61c382aaec55d494c2bc7482 SHA256 de1c04b3ba0e91eed61ac1fb0c7bbe755321a286e64cba6026bd8a66faaf74d3
+MD5 d455f402708407f2246fdde26e4a637e pam-0.78-r5.ebuild 9749
+RMD160 ae9380771b6b831104d7c60d7ebbb7065d72a7b0 pam-0.78-r5.ebuild 9749
+SHA256 de1c04b3ba0e91eed61ac1fb0c7bbe755321a286e64cba6026bd8a66faaf74d3 pam-0.78-r5.ebuild 9749
 EBUILD pam-0.99.8.1-r1.ebuild 5115 RMD160 31355f6429f95ff7afabeab24106e20a664031ff SHA1 f04f8526e32861a951df5e05e672dc2adb07d257 SHA256 3d9dcdf0469978c1999cb5043b6adadfcfc6e0b055087469bb70afe338154ba6
 MD5 b4ebf49a1e6e3ad66729daaa2e6926ee pam-0.99.8.1-r1.ebuild 5115
 RMD160 31355f6429f95ff7afabeab24106e20a664031ff pam-0.99.8.1-r1.ebuild 5115
@@ -40,17 +39,17 @@ EBUILD pam-0.99.9.0.ebuild 5181 RMD160 ea7be6653f7192f6ec78d4b0a55b578c59fe20c5
 MD5 6059a5d7b8d6015790cfdd81ee70a0a3 pam-0.99.9.0.ebuild 5181
 RMD160 ea7be6653f7192f6ec78d4b0a55b578c59fe20c5 pam-0.99.9.0.ebuild 5181
 SHA256 b09aaf78037d71e44c9e22d89b50e2edc365ec4a9cafe0d0eb03ad595946f936 pam-0.99.9.0.ebuild 5181
-MISC ChangeLog 30288 RMD160 798931d62f79093ead824aaf2d9fb228f59eb2fe SHA1 b4b3a75d2db2fac716c80aede3b2147b4fcee3ca SHA256 41781bdd093d2127d0a644747beee8cf9b77a52de371f3e537fcaab7eb937bd9
-MD5 0061b1d0963872ad0f6774b2f8abbef3 ChangeLog 30288
-RMD160 798931d62f79093ead824aaf2d9fb228f59eb2fe ChangeLog 30288
-SHA256 41781bdd093d2127d0a644747beee8cf9b77a52de371f3e537fcaab7eb937bd9 ChangeLog 30288
+MISC ChangeLog 30422 RMD160 018be2141f4f47b719916bd7d8b53adb29a469b1 SHA1 a520133696dc955dffa85044ee20c45376e654a9 SHA256 85e37fb180418321321a1f1d9215457767ae08576cc6075cfe1d0463eb4c2e50
+MD5 0b2132f295606c5cef9a44c5724fb69d ChangeLog 30422
+RMD160 018be2141f4f47b719916bd7d8b53adb29a469b1 ChangeLog 30422
+SHA256 85e37fb180418321321a1f1d9215457767ae08576cc6075cfe1d0463eb4c2e50 ChangeLog 30422
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
 SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c metadata.xml 218
-MD5 4acd467a58a6a83f640e9540babb2be6 files/digest-pam-0.78-r5 976
-RMD160 f272466c7321cec1715f9dd69818b7b79ca3582f files/digest-pam-0.78-r5 976
-SHA256 48f4d33093f701c4ac0ae848f7c51efb85d363679529908a980970bc861050c3 files/digest-pam-0.78-r5 976
+MD5 5948f642c2a6e7a45646c9860a69f61c files/digest-pam-0.78-r5 738
+RMD160 bc9e43bdc87f1d2454c68f6ca6d549dc6382ac89 files/digest-pam-0.78-r5 738
+SHA256 5e7344a0fadf2759cfa59a741d3342821b929c927c175b4e3606d520750af04c files/digest-pam-0.78-r5 738
 MD5 12f5aae84df52512f8f6974e24fa4975 files/digest-pam-0.99.8.1-r1 572
 RMD160 5497daf31e6a6c22666436adb16ca7d6668058c1 files/digest-pam-0.99.8.1-r1 572
 SHA256 1358afedddbaf1ad62f0ff02b2bf6ade5be96d36de8c7559fcaadaa25fb0a18d files/digest-pam-0.99.8.1-r1 572
@@ -60,7 +59,7 @@ SHA256 0ff0abf40c054b597a873b33cef50f2caae4f49b0056c736134b522332a5a371 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHSAqyAiZjviIA2XgRAsfUAJ0axVXluyIpPQqvWl1oHUORNmb+KQCfZG2v
-H9BF0JZTWSlH6IyaGR5FcJ4=
-=UCLa
+iD8DBQFHao4mAiZjviIA2XgRAk40AJ9mPsS51PCknzo9O8W2MEovj8zriACgvUZv
+8XNEFc09/p+SwRZIgSwsyCs=
+=LPip
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/digest-pam-0.78-r5 b/sys-libs/pam/files/digest-pam-0.78-r5
index 1fae6302036d..598e12bc452b 100644
--- a/sys-libs/pam/files/digest-pam-0.78-r5
+++ b/sys-libs/pam/files/digest-pam-0.78-r5
@@ -4,9 +4,6 @@ SHA256 a18b9f7b45344a4e49d2647c036894cc6578f249fa0cf024763f1140df684d3e Linux-PA
 MD5 fcc481d52c3b80e20a328f8c0cb042bd db-4.3.27.tar.gz 5921872
 RMD160 711129871c7edd840184bd5a87fb7bf93c8bb953 db-4.3.27.tar.gz 5921872
 SHA256 6f09e04c5811ad72a2a5c99459340cb2c635e6553520af76fc9e717dd6207244 db-4.3.27.tar.gz 5921872
-MD5 777d2e34a60edad28319207b576cda91 glib-2.6.5.tar.bz2 2357089
-RMD160 6ccdfed7ea5621b7c69c436c3b8b5fbba44dc62e glib-2.6.5.tar.bz2 2357089
-SHA256 ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca glib-2.6.5.tar.bz2 2357089
 MD5 aa8983563b7d6f4904a26d2b5c7448bd pam-0.78-patches-1.6.tar.bz2 91527
 RMD160 af880422f7e0f6440debf6885a4e3ca048dc67a9 pam-0.78-patches-1.6.tar.bz2 91527
 SHA256 54241417a9e19b02457b3d9997e6ca24c14da86e22d447873440853a7525c9bb pam-0.78-patches-1.6.tar.bz2 91527
diff --git a/sys-libs/pam/pam-0.78-r5.ebuild b/sys-libs/pam/pam-0.78-r5.ebuild
index c1717524b2ff..8acc7738ac87 100644
--- a/sys-libs/pam/pam-0.78-r5.ebuild
+++ b/sys-libs/pam/pam-0.78-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r5.ebuild,v 1.20 2007/11/15 16:59:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r5.ebuild,v 1.21 2007/12/20 15:45:36 flameeyes Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
@@ -23,24 +23,21 @@ S="${WORKDIR}/Linux-PAM-${PV}"
 S2="${WORKDIR}/pam-${PV}-patches"
 SRC_URI="mirror://kernel/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
 	mirror://gentoo/pam-${PV}-patches-${PATCH_LEVEL}.tar.bz2
-	berkdb? ( http://downloads.sleepycat.com/db-${BDB_VER}.tar.gz )
-	pam_console? ( ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${GLIB_VER}.tar.bz2 )"
+	berkdb? ( http://downloads.sleepycat.com/db-${BDB_VER}.tar.gz )"
 
 LICENSE="PAM"
 SLOT="0"
 KEYWORDS="mips"
-IUSE="berkdb pwdb selinux pam_chroot pam_console pam_timestamp nis"
+IUSE="berkdb pwdb selinux pam_chroot pam_timestamp nis"
 
 RDEPEND=">=sys-libs/cracklib-2.8.3
 	selinux? ( >=sys-libs/libselinux-1.28 )
 	berkdb? ( >=sys-libs/db-${BDB_VER2} )
 	pwdb? ( >=sys-libs/pwdb-0.62 )
-	!sys-auth/pam_console
 	!sys-auth/pam_userdb
 	!sys-auth/pam_chroot"
 
-# Note that we link to static versions of glib (pam_console.so)
-# and pwdb (pam_pwdb.so), so we need glib-2.6.2-r1 or later ...
+# Note that we link to static versions of and pwdb (pam_pwdb.so)
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-util/pkgconfig
@@ -89,14 +86,6 @@ pkg_setup() {
 	#		fi
 	#	done
 	#fi
-	#if use pam_console; then
-	#	x="libglib-2.0.a"
-	#	if [ ! -f "${ROOT}/usr/$(get_libdir)/${x}" ]; then
-	#		eerror "Could not find /usr/$(get_libdir)/${x} needed to build Linux-PAM!"
-	#		eerror "Please remerge glib-2.6.* to make sure you have static changes."
-	#		die "Could not find /usr/$(get_libdir)/${x} needed to build Linux-PAM!"
-	#	fi
-	#fi
 
 	return 0
 }
@@ -122,9 +111,10 @@ src_unpack() {
 
 	# Check which extra modules should be built
 	# (Do this after apply_pam_patches(), else some may fail)
-	for x in pam_chroot pam_console pam_timestamp; do
+	for x in pam_chroot pam_timestamp; do
 		use "${x}" || rm -rf "${S}/modules/${x}"
 	done
+	rm -rf "${S}/modules/pam_console"
 	use berkdb || rm -rf "${S}/modules/pam_userdb"
 	use pwdb || rm -rf "${S}/modules/pam_pwdb"
 	use pwdb || rm -rf "${S}/modules/pam_radius"
@@ -196,35 +186,7 @@ src_compile() {
 		make install || die
 	fi
 
-	if use pam_console ; then
-		einfo "Building GLIB ${GLIB_VER}..."
-		cd "${GLIB_DIR}" || die
-
-		# The __attribute__((visibility("hidden"))) causes TEXTREL issues
-		sed -i -s 's:G_GNUC_INTERNAL::g' "${GLIB_DIR}/glib"/*.c
-
-		CFLAGS="${CFLAGS} -fPIC" \
-		./configure \
-			--host=${CHOST} \
-			--enable-static \
-			--disable-shared \
-			--with-pic \
-			--disable-threads \
-			--with-threads=none \
-			--prefix="${S}" \
-			--includedir="${S}/include" \
-			--libdir="${S}/lib" || die "Bad GLIB ./configure"
-
-		# Do not need to build the whole shebang
-		cd "${GLIB_DIR}/glib" || die
-		make CC="$(tc-getCC)" || die "GLIB build failed"
-		make install || die
-		# Install pkg-config stuff and needed headers
-		cd "${GLIB_DIR}" || die
-		make install-pkgconfigDATA install-exec-local || die
-	fi
-
-	if use berkdb || use pam_console ; then
+	if use berkdb ; then
 		# Make sure out static libs are used
 		export CFLAGS="-I${S}/include -Wl,-L${S}/lib ${CFLAGS}"
 		export LDFLAGS="-L${S}/lib ${LDFLAGS}"
@@ -327,9 +289,6 @@ src_install() {
 
 	cd ${S}
 
-	# need this for pam_console
-	keepdir /var/run/console
-
 	newpamd "${FILESDIR}/system-auth.pamd.0.78" system-auth
 	newpamd "${FILESDIR}/other.pamd" other
 
@@ -345,8 +304,6 @@ src_install() {
 
 	dodoc CHANGELOG Copyright README
 	docinto modules ; dodoc modules/README ; dodoc doc/txts/README.*
-	# Install our own README.pam_console
-	docinto modules ; dodoc "${S2}/gentoo-extrafiles/README.pam_console"
 	docinto txt ; dodoc doc/specs/*.txt #doc/txts/*.txt
 #	docinto print ; dodoc doc/ps/*.ps
 
@@ -382,11 +339,4 @@ pkg_postinst() {
 			rm -f ${ROOT}/etc/pam.d/system-auth.new
 		fi
 	fi
-
-	if use pam_console; then
-		echo
-		elog "If you want to enable the pam_console module, please follow"
-		elog "the instructions in /usr/share/doc/${PF}/README.pam_console."
-		echo
-	fi
 }