remove upstream-unsupported static linking (bug #394703)

Package-Manager: portage-2.1.10.11/cvs/Linux i686

3 files changed, 17 insertions, 41 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index c6f36ac28276..810c7151b645 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.313 2011/12/04 09:53:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.314 2011/12/14 22:46:02 mr_bones_ Exp $
+
+  14 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.2.5.ebuild:
+  remove upstream-unsupported static linking (bug #394703)
 
   04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/syslog-ng.rc6.3:
   move reload to extra_started_commands in 3.2 init script
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 078dda964494..e498eaf86e09 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX syslog-ng-3.3.1-filter.patch 2291 RMD160 1e004c712b953ce97b99bc48ebf6afcf54a27ee3 SHA1 45d850e1bf3f7e95a1d2c25b89ea11d854e92e5d SHA256 ec35b270d48834639c0e5185bf4088ad3fba97647874379f8136e669ac3b9cca
 AUX syslog-ng-3.3.1-ssl.patch 1941 RMD160 30b8effa6b5e0994700f3a652b997a6c83341151 SHA1 138b55c4e7f48838752136746d0fe47aa305e5ca SHA256 560d67c39d1c9320ca353ae55e4b5da9fd656b854bf8f1d193e2f791047f1303
 AUX syslog-ng.conf.gentoo.3.2 1314 RMD160 d8d12cbc02877baf4449590586798133d9914911 SHA1 af084e744864dcc292741df2cc701d1f8a982e00 SHA256 91221fe7aeb6dff126dd878f541366d00918a278f46348f6f763ad2cbc01ea19
@@ -19,15 +16,8 @@ DIST syslog-ng_3.2.5.tar.gz 1448844 RMD160 dcaf5bc623d163f36a8b7d76cfbaa09142a5a
 DIST syslog-ng_3.3.1.tar.gz 2405280 RMD160 f337db97ff445d8bb8a087d1894103443d8d2c2c SHA1 f084d66754c7fa1eada56946f77ef3066faa27a1 SHA256 2cd5e0102504cb9d7bb25570bbb3fdd8657aa1b1afdc18f7b9aa892d8f9c9089
 DIST syslog-ng_3.3.3.tar.gz 2417218 RMD160 b585c9aac9e8f279956054ee7894afb0ecd1bcd2 SHA1 e2ec8ba4bde24809630a7675bf5d97f00be467f8 SHA256 eaea7e42829999925d9f628b1b8b09ef47864c58f61d604a9b6b45f8af9e2d4a
 EBUILD syslog-ng-3.2.4.ebuild 3293 RMD160 6968178b4bc2d3d80e4e322a466bc3875cd04fc3 SHA1 e667079278b7a643518736171939b486b9c4e680 SHA256 0071029876f2a2a7029a7e356ad2f7f28de805dfe127d22f855a0a04feb7b985
-EBUILD syslog-ng-3.2.5.ebuild 3239 RMD160 0bf18b7866ae142df1784d3bc04863b08b6a71dd SHA1 bb77cf4869ccc3c8a35cb35463b30ea5aa7d6ab3 SHA256 c0f1a8fc03d4e7daef5866c97d3b045ca1a613e39f1d14410dc22904d78e9e79
+EBUILD syslog-ng-3.2.5.ebuild 2867 RMD160 5890105f8bd6b11c09803fd134915f6652355dc8 SHA1 f4683273c96a0c9eb94b22d51a2e75e794c63f4e SHA256 a4b1e3951ccbabf5e2ace10a01d649492553b3204d1d2dd717cf615e2fb29243
 EBUILD syslog-ng-3.3.1.ebuild 3633 RMD160 2406c9a3682122890be57cfb04a42726449ba9cc SHA1 6d19fbb2f9a22633ebe4dd34bb90a317de7a3e86 SHA256 93de061e64679cc03f6a37beef851bbf2ee30cdd3bae6ffb4a7d5925685b66a8
 EBUILD syslog-ng-3.3.3.ebuild 3556 RMD160 df5c74054718a5e4ab32678798ebf4a3e1e78467 SHA1 4bf7d1bccaef078b8ee3058c60ecb1ccbc2e1f78 SHA256 9729a9f0f231fa29d26c374c0d910ab0ded4e4491b87b02370505756a5bdeb35
-MISC ChangeLog 42852 RMD160 d13243467bcb2a18093e2c38c5b474369f4b8221 SHA1 f0cd0e343e55676a8ba1d3c7cabe27abd7a56e13 SHA256 dca605d65c8fc2d004beda73f0bd65e8334536eb4e627c4d755a53167ffd4b73
+MISC ChangeLog 42992 RMD160 4781f972346238c426350256fac6a145c2de2206 SHA1 52f0a6a6a2577bb749fb6b4e8d131cb3d7669b9b SHA256 c09ec9f5fdb3faf9b490bb9ac8687c86f5232638b4cffb8d90e85ccf527ea61a
 MISC metadata.xml 559 RMD160 ea078d9f0296f07dc3ffa3f0f8ae69f979ba4d3b SHA1 0ec5700dd8e3ae0ae458086778908b818349061a SHA256 b0a3c093ff517898bb36172559a8778e0290a5a95255df64e1fe223232837cd7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk7bQyoACgkQI1lqEGTUzyRHSQCfcsqqxvn6dyRx6bTQWAvt0AoL
-f1IAoMyfaZCUhk75ILdzoJUMN03gt2t7
-=ksti
------END PGP SIGNATURE-----
diff --git a/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild b/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild
index 9529dd9541bf..5bb699ed31c6 100644
--- a/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.2.5.ebuild,v 1.1 2011/11/07 21:33:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild,v 1.2 2011/12/14 22:46:02 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools fixheadtails eutils multilib
@@ -13,25 +13,19 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/s
 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"
+IUSE="caps hardened ipv6 +pcre selinux spoof-source sql ssl tcpd"
 RESTRICT="test"
 
-LIBS_DEPEND="
-	spoof-source? ( net-libs/libnet )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!static? ( >=dev-libs/eventlog-0.2.12 )
-	>=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}
-	)"
+		spoof-source? ( net-libs/libnet )
+		ssl? ( dev-libs/openssl )
+		tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+		>=dev-libs/eventlog-0.2.12
+		>=dev-libs/glib-2.10.1:2
+		caps? ( sys-libs/libcap )
+		sql? ( >=dev-db/libdbi-0.8.3 )"
 DEPEND="${RDEPEND}
-	${LIBS_DEPEND}
-	static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
 	dev-util/pkgconfig
 	sys-devel/flex"
 
@@ -41,19 +35,9 @@ src_prepare() {
 }
 
 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 \
+		--enable-dynamic-linking \
 		--sysconfdir=/etc/syslog-ng \
 		--localstatedir=/var/lib/misc \
 		--with-pidfile-dir=/var/run \
@@ -64,8 +48,7 @@ src_configure() {
 		$(use_enable spoof-source) \
 		$(use_enable sql) \
 		$(use_enable ssl) \
-		$(use_enable tcpd tcp-wrapper) \
-		${myconf}
+		$(use_enable tcpd tcp-wrapper)
 }
 
 src_install() {