projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0706bac)
Fix autotools for bug #151140
authorCédric Krier <cedk@gentoo.org>
Wed, 29 Nov 2006 21:25:16 +0000 (21:25 +0000)
committerCédric Krier <cedk@gentoo.org>
Wed, 29 Nov 2006 21:25:16 +0000 (21:25 +0000)
Package-Manager: portage-2.1.1-r1

net-analyzer/nagios-plugins/ChangeLog patch | blob | history
net-analyzer/nagios-plugins/Manifest patch | blob | history
net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild patch | blob | history
net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild patch | blob | history
net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild patch | blob | history

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 8c5435cf681e784f534ea375ee8575ef7fbaf05a..d6593352caf83c86365fdb4ea70dfd5bc1e96092 100644 (file)
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.54 2006/11/23 19:51:53 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.55 2006/11/29 21:25:16 cedk Exp $
+
+  29 Nov 2006; Cedric Krier <cedk@gentoo.org> nagios-plugins-1.4.2.ebuild,
+  nagios-plugins-1.4.2-r1.ebuild, nagios-plugins-1.4.3-r1.ebuild:
+  Fix autotools for bug #151140
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
   nagios-plugins-1.3.1-r1.ebuild, nagios-plugins-1.4.ebuild,
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 152a931cc082e0cf747bc5630ace5d87f47699de..884a7c7aaee2a97673aef66e38586460433fd422 100644 (file)
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -35,26 +35,26 @@ EBUILD nagios-plugins-1.4.1.ebuild 3374 RMD160 797fa255b4421230e7ee2a6a57a31ebae
 MD5 49b66dc42b98c45fb91c2350c2a08af1 nagios-plugins-1.4.1.ebuild 3374
 RMD160 797fa255b4421230e7ee2a6a57a31ebae1ba47d8 nagios-plugins-1.4.1.ebuild 3374
 SHA256 24336a3cf94754f1608598cdda2d67a0dbb35a0965e81879f521f1810209794d nagios-plugins-1.4.1.ebuild 3374
-EBUILD nagios-plugins-1.4.2-r1.ebuild 3432 RMD160 a48bb1e455e799960baab5c53fa80b9e397adf41 SHA1 86e255ef5fe23b0be1abdec4f462e90d3c45d31a SHA256 8ca5f3be7b0e70f10e7d5399826ef9ff436a2a3a4c5e61f4244c72087fdac27c
-MD5 50dc90388bca6a864076c52d52f910ab nagios-plugins-1.4.2-r1.ebuild 3432
-RMD160 a48bb1e455e799960baab5c53fa80b9e397adf41 nagios-plugins-1.4.2-r1.ebuild 3432
-SHA256 8ca5f3be7b0e70f10e7d5399826ef9ff436a2a3a4c5e61f4244c72087fdac27c nagios-plugins-1.4.2-r1.ebuild 3432
-EBUILD nagios-plugins-1.4.2.ebuild 3377 RMD160 5edbb19adf273227cea7d1ae512ef599a7916ad2 SHA1 ede7fce2113aa82a416756148a97f610520e8db3 SHA256 92bdb908fa0cc9fec0460d5cad176f1bde9383a09914d180e30b6425fb2cab1c
-MD5 1eb133e6770f06b12679276b0b6ce4ed nagios-plugins-1.4.2.ebuild 3377
-RMD160 5edbb19adf273227cea7d1ae512ef599a7916ad2 nagios-plugins-1.4.2.ebuild 3377
-SHA256 92bdb908fa0cc9fec0460d5cad176f1bde9383a09914d180e30b6425fb2cab1c nagios-plugins-1.4.2.ebuild 3377
-EBUILD nagios-plugins-1.4.3-r1.ebuild 3675 RMD160 a01c1a03c8837946e73c5518a62e38edd696c079 SHA1 c2a968def3caaae99ceb0be7ce83b29235fada87 SHA256 c62a506e92eee60b4bb3454761e2005bf253190a16349d830ad210179dfcd092
-MD5 e8eb4eca6270b6cf52acea9eca24c954 nagios-plugins-1.4.3-r1.ebuild 3675
-RMD160 a01c1a03c8837946e73c5518a62e38edd696c079 nagios-plugins-1.4.3-r1.ebuild 3675
-SHA256 c62a506e92eee60b4bb3454761e2005bf253190a16349d830ad210179dfcd092 nagios-plugins-1.4.3-r1.ebuild 3675
+EBUILD nagios-plugins-1.4.2-r1.ebuild 3565 RMD160 34f4f3651e581527e7cedd4ddc9f7cfcab60d551 SHA1 3e3f2c07ffef89aa0641184a3225b1bf043c4ae5 SHA256 1417b7a055163f1c57d4f99743ef7d09c895f5d0833de8bbb4ce2bbb8dbd5a19
+MD5 7eedd0fcda9ae179fe1c9eb67f2e657e nagios-plugins-1.4.2-r1.ebuild 3565
+RMD160 34f4f3651e581527e7cedd4ddc9f7cfcab60d551 nagios-plugins-1.4.2-r1.ebuild 3565
+SHA256 1417b7a055163f1c57d4f99743ef7d09c895f5d0833de8bbb4ce2bbb8dbd5a19 nagios-plugins-1.4.2-r1.ebuild 3565
+EBUILD nagios-plugins-1.4.2.ebuild 3429 RMD160 087d0c79cb5298e0c3752b1d0be9f4e891c4e7c5 SHA1 dfcc998287b8ff09f296318659e5398bd9a48130 SHA256 94ebe7b0f8dbb046eae07ce488701f10dd7b736d0958fa452f3d171e3f5ea7bb
+MD5 a92d1d76e5c10463ea234814b2e7515d nagios-plugins-1.4.2.ebuild 3429
+RMD160 087d0c79cb5298e0c3752b1d0be9f4e891c4e7c5 nagios-plugins-1.4.2.ebuild 3429
+SHA256 94ebe7b0f8dbb046eae07ce488701f10dd7b736d0958fa452f3d171e3f5ea7bb nagios-plugins-1.4.2.ebuild 3429
+EBUILD nagios-plugins-1.4.3-r1.ebuild 3779 RMD160 3f2e0f9a951f3adec25d1b4b4b7711c618e7c15f SHA1 5fdd246a5089eca02df9f610931f73da54c6f387 SHA256 3f201c7173fd1b80a7c24e682a7a0f23c21841d7fc5f378a0812e9354b749134
+MD5 aa72a9a18426d1d4c740227f8f1e7eea nagios-plugins-1.4.3-r1.ebuild 3779
+RMD160 3f2e0f9a951f3adec25d1b4b4b7711c618e7c15f nagios-plugins-1.4.3-r1.ebuild 3779
+SHA256 3f201c7173fd1b80a7c24e682a7a0f23c21841d7fc5f378a0812e9354b749134 nagios-plugins-1.4.3-r1.ebuild 3779
 EBUILD nagios-plugins-1.4.ebuild 3265 RMD160 7b88c39fe2ebcb7bcc7d2c414a8af45432d727e3 SHA1 caf1d4410161e68975c8f5a0a56c4661d7b1e751 SHA256 c447467b9bda54363959f00cecb27ef744d0cb32e19aa19f8b1840b3a3190e89
 MD5 b4ca28fcda59f2322f2ec8d96d189ebe nagios-plugins-1.4.ebuild 3265
 RMD160 7b88c39fe2ebcb7bcc7d2c414a8af45432d727e3 nagios-plugins-1.4.ebuild 3265
 SHA256 c447467b9bda54363959f00cecb27ef744d0cb32e19aa19f8b1840b3a3190e89 nagios-plugins-1.4.ebuild 3265
-MISC ChangeLog 9695 RMD160 4eca41091a54ff393362a9599b0b1e989098d144 SHA1 07c8cdda01e6e34c055dd5924fd9bd409edac145 SHA256 7b90620fa2f1d887cab49a2d6894bc3059f684719c21b8370d1f05adf4062ba0
-MD5 4223717580e1115b2fc30a9e0d188ada ChangeLog 9695
-RMD160 4eca41091a54ff393362a9599b0b1e989098d144 ChangeLog 9695
-SHA256 7b90620fa2f1d887cab49a2d6894bc3059f684719c21b8370d1f05adf4062ba0 ChangeLog 9695
+MISC ChangeLog 9869 RMD160 aacce3836284299076503dbc07819afb4601d8a2 SHA1 bf5430af7c6f251fcaceaff2a9a4ad3951b29de3 SHA256 aac1c0b8a12a5db3e7ee9f1b83ac80f13edb6307b92488e2674d1ade86d85158
+MD5 7756628288e38e2d2b97db07a9fb7e4c ChangeLog 9869
+RMD160 aacce3836284299076503dbc07819afb4601d8a2 ChangeLog 9869
+SHA256 aac1c0b8a12a5db3e7ee9f1b83ac80f13edb6307b92488e2674d1ade86d85158 ChangeLog 9869
 MISC metadata.xml 371 RMD160 8cd19aa36cd4f4615a30bbcdb0429b7dc0b7430f SHA1 32ad1225f75741bdb533609eef9004f5941dd839 SHA256 af0d4f06a9c915ebb24d136adae1ab0d3525db2a2ccd247aff558b1358bf43a1
 MD5 5db356dad10986a73f73a0335265ad92 metadata.xml 371
 RMD160 8cd19aa36cd4f4615a30bbcdb0429b7dc0b7430f metadata.xml 371
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
index 63f867b51afc0359e8d661211ea5f2d7a1d0de2c..7a1c03b9a1f782442375a57cf5d84039d5600641 100644 (file)
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild,v 1.6 2006/11/23 19:51:53 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild,v 1.7 2006/11/29 21:25:16 cedk Exp $
 
-inherit eutils
+WANT_AUTOCONF=2.58
+WANT_AUTOMAKE=1.8
+
+inherit eutils autotools
 
 DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
 HOMEPAGE="http://www.nagios.org/"
@@ -44,26 +47,32 @@ pkg_setup() {
 
 src_unpack() {
        unpack ${A}
+       cd "${S}"
        if ! use radius; then
-               EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch
+               EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch \
+                       "${FILESDIR}"/nagios-plugins-1.4-autoconf-fix.patch
        fi
        if ! use radius; then
-               export WANT_AUTOCONF=2.5
-               export WANT_AUTMAKE=1.8
-               cd ${S}
-               aclocal -I m4 || die "Failed to run aclocal"
-               autoconf || die "Failed to run autoconf"
-               automake || die "Failed to run automake"
+               eaclocal -I m4 || die "eaclocal failed"
+               eautoconf || die "eautoconf failed"
+               automake || die "automake failed"
        fi
 }
 
 src_compile() {
 
+       local conf
+       if use ssl; then
+               conf="${conf} --with-openssl=/usr"
+       else
+               conf="${conf} --without-openssl"
+       fi
+
        econf \
                $(use_with mysql) \
                $(use_with postgres) \
-               $(use_with ssl openssl) \
                $(use_with ipv6) \
+               ${conf} \
                --host=${CHOST} \
                --prefix=/usr/nagios \
                --with-nagios-user=nagios \
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
index af03d75a12edadacd325784cc08c3261f607b4ed..43e7869dfd48ddd7b68231117a01f70edb6a5956 100644 (file)
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild,v 1.8 2006/11/23 19:51:53 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild,v 1.9 2006/11/29 21:25:16 cedk Exp $
 
-inherit eutils
+WANT_AUTOCONF=2.58
+WANT_AUTOMAKE=1.8
+
+inherit eutils autotools
 
 DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
 HOMEPAGE="http://www.nagios.org/"
@@ -44,11 +47,10 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        if ! use radius; then
-               EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch
+               EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch \
+                       "${FILESDIR}"/nagios-plugins-1.4-autoconf-fix.patch
        fi
        if ! use radius; then
-               export WANT_AUTOCONF=2.5
-               export WANT_AUTMAKE=1.8
                cd ${S}
                aclocal -I m4 || die "Failed to run aclocal"
                autoconf || die "Failed to run autoconf"
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
index 4fff72b37e334bae913d1fac0f62985034bea532..523e5497c524490bf4678864e03b50934f829533 100644 (file)
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild,v 1.4 2006/11/23 19:51:53 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild,v 1.5 2006/11/29 21:25:16 cedk Exp $
 
-inherit eutils
+WANT_AUTOCONF=2.58
+WANT_AUTOMAKE=1.8
+
+inherit eutils autotools
 
 DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
 HOMEPAGE="http://www.nagios.org/"
@@ -44,6 +47,7 @@ pkg_setup() {
 
 src_unpack() {
        unpack ${A}
+       cd "${S}"
        if ! use radius; then
                EPATCH_OPTS="-p0 -d ${S}" epatch \
                        ${FILESDIR}/nagios-plugins-1.4-noradius.patch \
@@ -55,23 +59,27 @@ src_unpack() {
        ${FILESDIR}/nagios-plugins-1.4.3-check_disk-fix.patch
 
        if ! use radius; then
-               export WANT_AUTOCONF=2.5
-               export WANT_AUTMAKE=1.8
-               cd ${S}
-               aclocal -I m4 || die "Failed to run aclocal"
-               autoconf || die "Failed to run autoconf"
-               automake || die "Failed to run automake"
-               libtoolize --copy --force
+               eaclocal -I m4 || die "eaclocal failed"
+               eautoconf || die "eautoconf failed"
+               automake || die "automake failed"
+               libtoolize --copy --force || die "libtoolize failed"
        fi
 }
 
 src_compile() {
 
+       local conf
+       if use ssl; then
+               conf="${conf} --with-openssl=/usr"
+       else
+               conf="${conf} --without-openssl"
+       fi
+
        econf \
                $(use_with mysql) \
                $(use_with postgres) \
-               $(use_with ssl openssl) \
                $(use_with ipv6) \
+               ${conf} \
                --host=${CHOST} \
                --prefix=/usr/nagios \
                --with-nagios-user=nagios \
@@ -96,7 +104,7 @@ src_install() {
        dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
                Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
 
-       make DESTDIR="${D}" install || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
 
        if use mysql || use postgres; then
                dodir /usr/nagios/libexec
Unnamed repository; edit this file 'description' to name the repository.