summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2009-02-24 17:07:42 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2009-02-24 17:07:42 +0000
commit0b41946857c2a500f7dec1db91e16640052fd006 (patch)
tree1e4a7f156236ea4413e1e7ffd2f4ec21c2e3b0d2 /net-analyzer/nagios-core
parentVersion bump #247466. (diff)
downloadhistorical-0b41946857c2a500f7dec1db91e16640052fd006.tar.gz
historical-0b41946857c2a500f7dec1db91e16640052fd006.tar.bz2
historical-0b41946857c2a500f7dec1db91e16640052fd006.zip
Move libpng built_with_use check to an EAPI=2 use dependency, #260031
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/nagios-core')
-rw-r--r--net-analyzer/nagios-core/ChangeLog6
-rw-r--r--net-analyzer/nagios-core/Manifest4
-rw-r--r--net-analyzer/nagios-core/nagios-core-3.1.0.ebuild16
3 files changed, 9 insertions, 17 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index de2e210ae6b5..7241fd70285d 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/nagios-core
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.140 2009/02/01 16:39:13 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.141 2009/02/24 17:07:42 dertobi123 Exp $
+
+ 24 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+ nagios-core-3.1.0.ebuild:
+ Move libpng built_with_use check to an EAPI=2 use dependency, #260031
01 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
nagios-core-3.0.6-r1.ebuild:
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 2efa50921e47..8efd17bcf3a8 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -12,6 +12,6 @@ DIST nagios-3.0.6.tar.gz 2735504 RMD160 1c2b026b4dc5095f2419d239042b75200db1b95f
DIST nagios-3.1.0.tar.gz 2724545 RMD160 adae68a67f74e87fb1e6d0d49743704d55eee648 SHA1 0bf1cc2fbca92dfa82b11592d3d5adc6ac3983db SHA256 30b81eb7943805b129d1db18bb67386feb998f9e6464cb2efbea0756499b2651
EBUILD nagios-core-2.12.ebuild 6719 RMD160 d8dbabbce75d22a7264cc1a61dee505865b5131a SHA1 37c2aff853a2fe3289ed6d1e21729932da3234ed SHA256 aa163f37b1eeaa0f0ea5da691c172c4be4a126aa2a3390837ed5a9fd6b077445
EBUILD nagios-core-3.0.6-r1.ebuild 6311 RMD160 6ac412aa7e088f7ed0ed56a98066858f12e90f23 SHA1 4c0e48421b82f16bd33b083792ad4b2e6c447526 SHA256 5d0ed94778fe36a7627c7d96cca3383c0e3fcf9b58fa13bc82a25e51e34654bf
-EBUILD nagios-core-3.1.0.ebuild 6392 RMD160 7b756c06e506c7f97a228cf89e7687c5388565cf SHA1 644d8de9fddb05e93045891f533ff4bcda87e282 SHA256 8cf8bfd8e7efad266124948e0f912ac8e6aa3bc8c9732ad08121e619e379f5a9
-MISC ChangeLog 24137 RMD160 18a6019c26ebcc9186c79f15c9dbe9bbd8c3bbbe SHA1 8e464391d8a089e7b444dee8145ed441a5a881e1 SHA256 22c209ed351e7a6ea1ca35bc0a60102e006a7738c8329f36d63384ad58914254
+EBUILD nagios-core-3.1.0.ebuild 6038 RMD160 83259d45e3d7348e74ade25bd8a3be4a66d8527e SHA1 99c42fa8d6fe70687ba8b1c657820d616d7d1572 SHA256 591d814f0b29d6b35b59bc9d3d70978206ce5a0ab0b4beb5c8e6cd867404ccc3
+MISC ChangeLog 24296 RMD160 62a594b3c0e375cec8bc1d153bf719da892425e6 SHA1 f5900e0d7f2a0f6e556c4dab789b973feda4e3ed SHA256 7e2f4a448c5738fa05f397336b43ab8255f7fe4e5f38cc84acd7d1a3b7ded419
MISC metadata.xml 1103 RMD160 126745b1627d4be7d8a3868e3670cb332df3d838 SHA1 3f5215646412a2aefde093d14561dd540d7abf01 SHA256 f2b241a3f4277286838954546eca184d08973197ce00e2f6a6ae2698f1eade81
diff --git a/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild b/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild
index fd96bd1ba1d1..650ef53855f2 100644
--- a/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild,v 1.2 2009/01/28 18:51:03 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild,v 1.3 2009/02/24 17:07:42 dertobi123 Exp $
EAPI="2"
@@ -17,9 +17,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug lighttpd perl +web vim-syntax"
DEPEND="virtual/mailx
web? (
- >=media-libs/jpeg-6b-r3
- >=media-libs/libpng-1.2.5-r4
- >=media-libs/gd-1.8.3-r5
+ >=media-libs/gd-1.8.3-r5[jpeg,png]
lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
)
@@ -32,16 +30,6 @@ want_apache2
S="${WORKDIR}/${MY_P}"
pkg_setup() {
- # Check if gd has been compiled with jpeg and png support
- if use web; then
- if ! built_with_use media-libs/gd jpeg png; then
- eerror "Your gd has been compiled without jpeg and/or png support."
- eerror "Please re-emerge gd:"
- eerror "# USE="jpeg png" emerge gd"
- die "pkg_setup failed"
- fi
- fi
-
enewgroup nagios
enewuser nagios -1 /bin/bash /var/nagios/home nagios
}