Remove old version; bypass Makefile and simply build the module within the ebuild, so that -Werror is dropped.

(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)

3 files changed, 17 insertions, 44 deletions

diff --git a/sys-auth/pam_chroot/ChangeLog b/sys-auth/pam_chroot/ChangeLog
index fa5a5f977d8e..c6ecbaad1cee 100644
--- a/sys-auth/pam_chroot/ChangeLog
+++ b/sys-auth/pam_chroot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/pam_chroot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/ChangeLog,v 1.12 2009/03/22 13:32:37 jmbsvicetto Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/ChangeLog,v 1.13 2011/05/16 09:09:19 flameeyes Exp $
+
+  16 May 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pam_chroot-0.9.1.ebuild, pam_chroot-0.9.2.ebuild:
+  Remove old version; bypass Makefile and simply build the module within the
+  ebuild, so that -Werror is dropped.
 
   22 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild b/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild
deleted file mode 100644
index 687bff906f67..000000000000
--- a/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild,v 1.9 2007/09/09 00:08:13 josejx Exp $
-
-inherit toolchain-funcs pam flag-o-matic eutils
-
-DESCRIPTION="Linux-PAM module that allows a user to be chrooted in auth, account, or session."
-HOMEPAGE="http://sourceforge.net/projects/pam-chroot/"
-SRC_URI="mirror://sourceforge/pam-chroot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	!<sys-libs/pam-0.99"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-gcc42.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		LDFLAGS="$(raw-ldflags)" || die "emake failed"
-}
-
-src_install() {
-	dopammod pam_chroot.so
-	dopamsecurity  . chroot.conf
-
-	dodoc CREDITS TROUBLESHOOTING options || die "dodoc failed"
-}
diff --git a/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild b/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild
index e496dfe748b9..707e576da75c 100644
--- a/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild
+++ b/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild,v 1.2 2008/03/21 14:34:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild,v 1.3 2011/05/16 09:09:19 flameeyes Exp $
 
 inherit toolchain-funcs pam flag-o-matic eutils
 
@@ -17,9 +17,15 @@ DEPEND="virtual/pam
 	!<sys-libs/pam-0.99"
 RDEPEND="${DEPEND}"
 
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
 src_compile() {
-	LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" LD="$(tc-getLD)" || die "emake failed"
+	# using the Makefile would require patching it to work properly, so
+	# rather simply re-create it here.
+	doecho $(tc-getCC) ${LDFLAGS} -shared -fPIC ${CFLAGS} ${PN}.c -o ${PN}.so -lpam
 }
 
 src_install() {