make sure people wanting a static build have the necessary library (bug #336516); clean old

(Portage version: 2.1.8.3/cvs/Linux i686)

8 files changed, 21 insertions, 220 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index d316f9ead877..55e0201c0875 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.254 2010/09/12 15:20:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.255 2010/09/13 03:39:05 mr_bones_ Exp $
+
+  13 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-2.1.4.ebuild, -syslog-ng-3.0.4.ebuild, -syslog-ng-3.0.6.ebuild,
+  syslog-ng-3.0.8.ebuild, syslog-ng-3.1.1.ebuild, syslog-ng-3.1.2.ebuild:
+  make sure people wanting a static build have the necessary library (bug
+  #336516); clean old
 
   12 Sep 2010; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.0.8.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #332335
diff --git a/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild b/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild
index d13be1aa36b9..595a17e1bfea 100644
--- a/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild
@@ -1,6 +1,6 @@
-# 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/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild,v 1.7 2009/05/31 22:18:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild,v 1.8 2010/09/13 03:39:05 mr_bones_ Exp $
 
 inherit fixheadtails
 
diff --git a/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild b/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild
index fa4049a67000..639359480964 100644
--- a/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild
@@ -1,6 +1,6 @@
-# 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/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild,v 1.8 2009/05/31 22:19:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild,v 1.9 2010/09/13 03:39:05 mr_bones_ Exp $
 
 EAPI=2
 inherit fixheadtails eutils
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="hardened ipv6 selinux spoof-source sql static tcpd"
 
-RDEPEND=">=dev-libs/eventlog-0.2
+RDEPEND="!static? ( >=dev-libs/eventlog-0.2 )
 	spoof-source? ( net-libs/libnet )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	sql? ( >=dev-db/libdbi-0.8.3 )
 	>=dev-libs/glib-2.4"
 DEPEND="${RDEPEND}
+	static? ( >=dev-libs/eventlog-0.2[static-libs] )
 	dev-util/pkgconfig
 	sys-devel/flex"
 PROVIDE="virtual/logger"
diff --git a/app-admin/syslog-ng/syslog-ng-3.0.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.0.4.ebuild
deleted file mode 100644
index 6f1d6d8b298d..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.0.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.0.4.ebuild,v 1.10 2010/03/02 21:29:03 mr_bones_ Exp $
-
-EAPI=2
-inherit fixheadtails eutils
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/syslog-ng_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps hardened ipv6 pcre selinux spoof-source sql ssl static tcpd"
-RESTRICT="test"
-
-LIBS_DEPEND="
-	spoof-source? ( net-libs/libnet )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/eventlog-0.2
-	>=dev-libs/glib-2.10.1:2
-	caps? ( sys-libs/libcap )
-	sql? ( >=dev-db/libdbi-0.8.3 )"
-RDEPEND="
-	!static? (
-		pcre? ( dev-libs/libpcre )
-		${LIBS_DEPEND}
-	)"
-DEPEND="${RDEPEND}
-	${LIBS_DEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex"
-PROVIDE="virtual/logger"
-
-src_prepare() {
-	ht_fix_file configure
-}
-
-src_configure() {
-	local myconf
-
-	if use static ; then
-		myconf="${myconf} --enable-static-linking"
-		if use pcre ; then
-			ewarn "USE=pcre is incompatible with static linking"
-			myconf="${myconf} --disable-pcre"
-		fi
-	else
-			myconf="${myconf} --enable-dynamic-linking"
-	fi
-	econf \
-		--disable-dependency-tracking \
-		--sysconfdir=/etc/syslog-ng \
-		--with-pidfile-dir=/var/run \
-		$(use_enable caps linux-caps) \
-		$(use_enable ipv6) \
-		$(use_enable pcre) \
-		$(use_enable spoof-source) \
-		$(use_enable sql) \
-		$(use_enable ssl) \
-		$(use_enable tcpd tcp-wrapper) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README \
-		doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
-		contrib/syslog-ng.conf* \
-		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf
-	elif use userland_BSD ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf
-	else
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	# Install snippet for logrotate, which may or may not be installed
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng
-	else
-		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
-	fi
-
-	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-}
-
-pkg_postinst() {
-	echo
-	elog "It is highly recommended that app-admin/logrotate be emerged to"
-	elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-	elog "for logrotate to use."
-	echo
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.0.6.ebuild b/app-admin/syslog-ng/syslog-ng-3.0.6.ebuild
deleted file mode 100644
index c16473c931e0..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.0.6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.0.6.ebuild,v 1.6 2010/05/30 17:45:02 armin76 Exp $
-
-EAPI=2
-inherit fixheadtails eutils
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/syslog-ng_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps hardened ipv6 pcre selinux spoof-source sql ssl static tcpd"
-RESTRICT="test"
-
-LIBS_DEPEND="
-	spoof-source? ( net-libs/libnet )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/eventlog-0.2
-	>=dev-libs/glib-2.10.1:2
-	caps? ( sys-libs/libcap )
-	sql? ( >=dev-db/libdbi-0.8.3 )"
-RDEPEND="
-	!static? (
-		pcre? ( dev-libs/libpcre )
-		${LIBS_DEPEND}
-	)"
-DEPEND="${RDEPEND}
-	${LIBS_DEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex"
-PROVIDE="virtual/logger"
-
-src_prepare() {
-	ht_fix_file configure
-}
-
-src_configure() {
-	local myconf
-
-	if use static ; then
-		myconf="${myconf} --enable-static-linking"
-		if use pcre ; then
-			ewarn "USE=pcre is incompatible with static linking"
-			myconf="${myconf} --disable-pcre"
-		fi
-	else
-			myconf="${myconf} --enable-dynamic-linking"
-	fi
-	econf \
-		--disable-dependency-tracking \
-		--sysconfdir=/etc/syslog-ng \
-		--with-pidfile-dir=/var/run \
-		$(use_enable caps linux-caps) \
-		$(use_enable ipv6) \
-		$(use_enable pcre) \
-		$(use_enable spoof-source) \
-		$(use_enable sql) \
-		$(use_enable ssl) \
-		$(use_enable tcpd tcp-wrapper) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README \
-		doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
-		contrib/syslog-ng.conf* \
-		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%%.*}" syslog-ng.conf
-	elif use userland_BSD ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%%.*}" syslog-ng.conf
-	else
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%%.*}" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	# Install snippet for logrotate, which may or may not be installed
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng
-	else
-		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
-	fi
-
-	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-}
-
-pkg_postinst() {
-	echo
-	elog "It is highly recommended that app-admin/logrotate be emerged to"
-	elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-	elog "for logrotate to use."
-	echo
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.0.8.ebuild b/app-admin/syslog-ng/syslog-ng-3.0.8.ebuild
index d15d78b4c5ab..18d66284c8e6 100644
--- a/app-admin/syslog-ng/syslog-ng-3.0.8.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.0.8.ebuild,v 1.7 2010/09/12 15:20:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.0.8.ebuild,v 1.8 2010/09/13 03:39:05 mr_bones_ Exp $
 
 EAPI=2
 inherit fixheadtails eutils
@@ -20,7 +20,7 @@ LIBS_DEPEND="
 	spoof-source? ( net-libs/libnet )
 	ssl? ( dev-libs/openssl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/eventlog-0.2
+	!static? ( >=dev-libs/eventlog-0.2 )
 	>=dev-libs/glib-2.10.1:2
 	caps? ( sys-libs/libcap )
 	sql? ( >=dev-db/libdbi-0.8.3 )"
@@ -31,6 +31,7 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	${LIBS_DEPEND}
+	static? ( >=dev-libs/eventlog-0.2[static-libs] )
 	dev-util/pkgconfig
 	sys-devel/flex"
 PROVIDE="virtual/logger"
diff --git a/app-admin/syslog-ng/syslog-ng-3.1.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.1.1.ebuild
index 817ad310f7a5..0363dd29e75e 100644
--- a/app-admin/syslog-ng/syslog-ng-3.1.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.1.1.ebuild,v 1.6 2010/09/06 21:14:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.1.1.ebuild,v 1.7 2010/09/13 03:39:05 mr_bones_ Exp $
 
 EAPI=2
 inherit fixheadtails eutils
@@ -20,7 +20,7 @@ LIBS_DEPEND="
 	spoof-source? ( net-libs/libnet )
 	ssl? ( dev-libs/openssl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/eventlog-0.2
+	!static? ( >=dev-libs/eventlog-0.2 )
 	>=dev-libs/glib-2.10.1:2
 	caps? ( sys-libs/libcap )
 	sql? ( >=dev-db/libdbi-0.8.3 )"
diff --git a/app-admin/syslog-ng/syslog-ng-3.1.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.1.2.ebuild
index 7014687c3af6..b05a6db16fb2 100644
--- a/app-admin/syslog-ng/syslog-ng-3.1.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.1.2.ebuild,v 1.4 2010/09/06 22:25:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.1.2.ebuild,v 1.5 2010/09/13 03:39:05 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools fixheadtails eutils
@@ -20,7 +20,7 @@ LIBS_DEPEND="
 	spoof-source? ( net-libs/libnet )
 	ssl? ( dev-libs/openssl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/eventlog-0.2
+	!static? ( >=dev-libs/eventlog-0.2 )
 	>=dev-libs/glib-2.10.1:2
 	caps? ( sys-libs/libcap )
 	sql? ( >=dev-db/libdbi-0.8.3 )"
@@ -31,6 +31,7 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	${LIBS_DEPEND}
+	static? ( >=dev-libs/eventlog-0.2[static-libs] )
 	dev-util/pkgconfig
 	sys-devel/flex"
 PROVIDE="virtual/logger"