Check if gd was compiled with jpeg ; closes #12483

7 files changed, 73 insertions, 12 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 09edce49cb9d..46320b4a9f0f 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.28 2004/07/01 17:04:29 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.29 2004/07/03 09:06:26 eldad Exp $
+
+  03 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild,
+  nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
+  nagios-core-1.2-r1.ebuild, nagios-core-1.2.ebuild:
+  Added a check in pkg_setup to test whether gd was compiled with jpeg. closes
+  #12483.
 
   01 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r1.ebuild:
   Prioritized mysql over postgresql, in case both USE flags are enabled. Closes
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 315a21d5e696..d859320b0e82 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,10 +1,10 @@
-MD5 9da4171ce0f4b285f1a4b65f803b93d4 nagios-core-1.1-r6.ebuild 5809
-MD5 eea47d7e6c49708d4a15ec39fd56c6a0 nagios-core-1.1-r5.ebuild 5810
-MD5 9d024973cc062c0b12f5f501a063340d ChangeLog 4641
+MD5 e3f87cefca75f1bd3684d926e044fed5 nagios-core-1.1-r6.ebuild 6200
+MD5 49acd9082d673ec2372af922fd51a03f nagios-core-1.1-r5.ebuild 6199
+MD5 c13d479fc6963c8f12bbdd42f851dedf ChangeLog 4912
 MD5 67125e899e40330692585273a7839c41 metadata.xml 980
-MD5 ae9c427bc3d73f1a10c19fac9a9ed415 nagios-core-1.2-r1.ebuild 5961
-MD5 1639df35f22bf259cda07f7445b332bd nagios-core-1.2.ebuild 5757
-MD5 ed199f8b068fe43e6f35a046a043ee54 nagios-core-1.1-r4.ebuild 5228
+MD5 f0342538a07860fcdf18d713d93b4e5e nagios-core-1.2-r1.ebuild 6352
+MD5 17eaf0ba662185f0f1b4a5a21c07a1de nagios-core-1.2.ebuild 6147
+MD5 a642bce37e7682783c763b42d94d966e nagios-core-1.1-r4.ebuild 5619
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2 63
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
index 31bfbb706dff..0a1f9c71a084 100644
--- a/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild,v 1.15 2004/06/30 17:44:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild,v 1.16 2004/07/03 09:06:26 eldad Exp $
 
 inherit eutils
 
@@ -28,6 +28,18 @@ DEPEND=">=mail-client/mailx-8.1
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+
+	# If there's a gd lib on the system, it will try to build with it.
+	# check if gdlib-config is on, and then check its output.
+	if [[ -x /usr/bin/gdlib-config ]]; then
+		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
+			eerror "Your gd has been compiled without jpeg support."
+			eerror "Please re-emerge gd:"
+			eerror "# USE="jpeg" emerge gd"
+			die "pkg_setup failed"
+		fi
+	fi
+
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /dev/null nagios
 }
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild
index 8eae5a3227f9..577b5e7e8c66 100644
--- a/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild,v 1.8 2004/06/30 17:44:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild,v 1.9 2004/07/03 09:06:26 eldad Exp $
 
 inherit eutils
 
@@ -32,6 +32,16 @@ DEPEND=">=mail-client/mailx-8.1
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	# If there's a gd lib on the system, it will try to build with it.
+	# check if gdlib-config is on, and then check its output.
+	if [[ -x /usr/bin/gdlib-config ]]; then
+		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
+			eerror "Your gd has been compiled without jpeg support."
+			eerror "Please re-emerge gd:"
+			eerror "# USE="jpeg" emerge gd"
+			die "pkg_setup failed"
+		fi
+	fi
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /dev/null nagios
 }
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild
index 32980f632f60..10aef3aa128b 100644
--- a/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild,v 1.9 2004/06/30 17:44:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild,v 1.10 2004/07/03 09:06:26 eldad Exp $
 
 inherit eutils
 
@@ -31,6 +31,17 @@ DEPEND=">=mail-client/mailx-8.1
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	# If there's a gd lib on the system, it will try to build with it.
+	# check if gdlib-config is on, and then check its output.
+	if [[ -x /usr/bin/gdlib-config ]]; then
+		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
+			eerror "Your gd has been compiled without jpeg support."
+			eerror "Please re-emerge gd:"
+			eerror "# USE="jpeg" emerge gd"
+			die "pkg_setup failed"
+		fi
+	fi
+
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /dev/null nagios
 }
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
index 264aeb9bfb90..55ef8ab5720e 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild,v 1.6 2004/07/01 17:04:29 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild,v 1.7 2004/07/03 09:06:26 eldad Exp $
 
 inherit eutils
 
@@ -32,6 +32,17 @@ DEPEND=">=mail-client/mailx-8.1
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	# If there's a gd lib on the system, it will try to build with it.
+	# check if gdlib-config is on, and then check its output.
+	if [[ -x /usr/bin/gdlib-config ]]; then
+		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
+			eerror "Your gd has been compiled without jpeg support."
+			eerror "Please re-emerge gd:"
+			eerror "# USE="jpeg" emerge gd"
+			die "pkg_setup failed"
+		fi
+	fi
+
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /dev/null nagios
 }
diff --git a/net-analyzer/nagios-core/nagios-core-1.2.ebuild b/net-analyzer/nagios-core/nagios-core-1.2.ebuild
index 02f2258f863c..a9a8ce1bb166 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2.ebuild,v 1.7 2004/06/30 17:44:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2.ebuild,v 1.8 2004/07/03 09:06:26 eldad Exp $
 
 inherit eutils
 
@@ -31,6 +31,17 @@ DEPEND=">=mail-client/mailx-8.1
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	# If there's a gd lib on the system, it will try to build with it.
+	# check if gdlib-config is on, and then check its output.
+	if [[ -x /usr/bin/gdlib-config ]]; then
+		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
+			eerror "Your gd has been compiled without jpeg support."
+			eerror "Please re-emerge gd:"
+			eerror "# USE="jpeg" emerge gd"
+			die "pkg_setup failed"
+		fi
+	fi
+
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /dev/null nagios
 }