Various improvements to the ebuild by Toffanin [Gentoo/FreeBSD AT] <toffanin.mauro...

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

diff --git a/sys-auth/openpam/ChangeLog b/sys-auth/openpam/ChangeLog
index 2d5a9d430be6b699da381913fdeadf6eeaf5aeed..d35e7b1366ac609408ad804ae65c5ba134a680f5 100644 (file)
--- a/sys-auth/openpam/ChangeLog
+++ b/sys-auth/openpam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/openpam
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/ChangeLog,v 1.15 2009/07/08 17:00:46 the_paya Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/ChangeLog,v 1.16 2010/05/02 11:20:56 aballier Exp $
+
+  02 May 2010; Alexis Ballier <aballier@gentoo.org> openpam-20071221.ebuild:
+  Various improvements to the ebuild by Toffanin [Gentoo/FreeBSD AT]
+  <toffanin.mauro@gmail.com> in bug #318121, esp. missing || die at make
+  install
 
   08 Jul 2009; Javier Villavicencio <the_paya@gentoo.org>
   openpam-20071221.ebuild:

diff --git a/sys-auth/openpam/Manifest b/sys-auth/openpam/Manifest
index ae5a43b9d7b220e0749048e397573ae41a8943fc..e014ae69cb62a263eef9ca391bf3c460772763d8 100644 (file)
--- a/sys-auth/openpam/Manifest
+++ b/sys-auth/openpam/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openpam-20050201-nbsd.patch 449 RMD160 f9d7a48fa48af267bda9766b359314bda884e2af SHA1 acc2b5498f04c2dcd78f748ce95b97d759f11eea SHA256 5ca47d57dc688dfddb24107026f049f70e520d62acde34b6a395b99b8be90d02
 AUX openpam-20050616-optional.patch 744 RMD160 d542e6ea3f5268e7020481a6d8b14cd723625402 SHA1 fe2495811266971bb257985c9c2bc15c46b6fda5 SHA256 aa360df90347ee520a063ede6befdf7b4e56360243ed319708f2852587e8dfdb
 AUX openpam-20050616-redef.patch 423 RMD160 2aa4219c7731f4c6dd0187653f39ceab1813ac68 SHA1 e422f20bd29e37b255e77de1139d7f4cb76b4588 SHA256 b5db305b4d80fe538b3d6b46dabc8975c50c3937eca73e6ca480a8f48327786c
 AUX openpam-20071221-gentoo.patch 5897 RMD160 9a17937b693f6917a8d1111bc240a539d40df9eb SHA1 1cc91137488370c91d3946d9a178a696ff631840 SHA256 71eac5df9bd81696f850503b37ac53effb329e4420bda6167bb72634191a24ba
 DIST openpam-20071221.tar.gz 396932 RMD160 cd8f7e94984693b0f892f226bfed6a3f9b24ec72 SHA1 43d41fa4a86199077c4fe193c52c59365f4c317e SHA256 d7d499441ee4e0cba9ca6ea13141a7eeb2e5afda0b712103968360494c7c7cf0
-EBUILD openpam-20071221.ebuild 1240 RMD160 f66a3845ba2239f4e7553ca7d8f080f4141bdfd3 SHA1 835c8eff62680cfdd0a929a3987c10bfdad73bb8 SHA256 31e16e0d72e4b5c0d90042a254e83318fb2121e64fbb145b52700309c06fa572
-MISC ChangeLog 2925 RMD160 14a9d753b8d5411c72d50ec43c3014ba38c28ccc SHA1 08cf18713fb522e0820be818f9f09806f8e79b1b SHA256 c8d4ef2b281cefd2d41d839cc16066cfcd546707026df2dbfb8b5179dfecd82e
+EBUILD openpam-20071221.ebuild 1164 RMD160 f0ba34eb8b483ba0f89844cdeb15af2d3f36a67c SHA1 3150276c23bfb1b5672a11ffe218d9d0d21781f7 SHA256 c2cca2b7045481f311dfdda19330b2ec192f757ec14e4bd31470c77363e93bef
+MISC ChangeLog 3155 RMD160 5fc4ed297f094f6ae03ff267abf0ba2c9dbfb0c1 SHA1 97843d54bbf67682f80d47d8665796c79bab71fa SHA256 71135cbf95e31e77778c01db6680940992c6ebefa2aa0e9a2fe51ee1f79cac63
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvdYB4ACgkQvFcC4BYPU0qgcgCgnamC/wkWrJtBrLMnQ21ahh0Z
+3O0AnjkFpXkP7ti6eXl5DMGlDtWvPB6X
+=GenV
+-----END PGP SIGNATURE-----

diff --git a/sys-auth/openpam/openpam-20071221.ebuild b/sys-auth/openpam/openpam-20071221.ebuild
index abe7a979fda698ad54b4a10401ede20f0abce020..36a408a3ef8cbc77707c83e1ecd5706f2ea933df 100644 (file)
--- a/sys-auth/openpam/openpam-20071221.ebuild
+++ b/sys-auth/openpam/openpam-20071221.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/openpam-20071221.ebuild,v 1.5 2009/07/08 17:00:46 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/openpam-20071221.ebuild,v 1.6 2010/05/02 11:20:56 aballier Exp $
 
-inherit multilib flag-o-matic autotools
+EAPI="2"
+inherit multilib autotools
 
 DESCRIPTION="Open source PAM library."
 HOMEPAGE="http://www.openpam.org/"
@@ -21,10 +22,7 @@ PDEPEND="sys-auth/pambase
 
 PROVIDE="virtual/pam"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        epatch "${FILESDIR}/${P}-gentoo.patch"
        epatch "${FILESDIR}/${PN}-20050201-nbsd.patch"
        epatch "${FILESDIR}/${PN}-20050616-redef.patch"
@@ -36,18 +34,14 @@ src_unpack() {
        elibtoolize
 }
 
-src_compile() {
-       econf \
+src_configure() {
+       econf ${myconf} \
                --disable-dependency-tracking \
-               --with-modules-dir=/$(get_libdir)/security/ \
-               ${myconf} || die "econf failed"
-
-       emake || die "emake failed"
+               --with-modules-dir=/$(get_libdir)/security/
 }
 
 src_install() {
-       emake -j1 DESTDIR="${D}" install
-
+       emake -j1 DESTDIR="${D}" install || die
        dodoc CREDITS HISTORY RELNOTES README || die
 
        find "${D}" -name '*.la' -delete || die