Append -fno-strict-aliasing for now, till the strict-aliasing breakage has been fixed. Remove old version.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

7 files changed, 39 insertions, 93 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index fbe58c9455be..5177e9ab5d70 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.54 2011/09/20 16:00:25 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.55 2011/09/21 13:44:51 idl0r Exp $
+
+  21 Sep 2011; Christian Ruppert <idl0r@gentoo.org> haproxy-1.3.25.ebuild,
+  haproxy-1.3.26.ebuild, -haproxy-1.4.8.ebuild, haproxy-1.4.15.ebuild,
+  haproxy-1.4.18.ebuild:
+  Append -fno-strict-aliasing for now, till the strict-aliasing breakage has
+  been fixed. Remove old version.
 
 *haproxy-1.4.18 (20 Sep 2011)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0dbd657083d5..29cb89ea19a9 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,22 +6,20 @@ DIST haproxy-1.3.25.tar.gz 662198 RMD160 54fac52224e5e1a32d19c4e8b5da92e1ee6ed6f
 DIST haproxy-1.3.26.tar.gz 668337 RMD160 f11286cef16eb3c9e29d09da3293316957226843 SHA1 4a93bcf6bcd48969fa44ac8081ce7a8baf518e17 SHA256 ab97d7f524b8c816c2b42b99d63691c819a32fe593c22242dad3108c7f85f274
 DIST haproxy-1.4.15.tar.gz 812293 RMD160 1a5e3e5c4ea71e4d439ffc4b221e31ae90d04f88 SHA1 8c42bc8c7d3714061b6fb74b0e3565d1e672556f SHA256 4baebfe0a5a9220f77d9175b2e711dc8985bbb696d11c38033cc0e94e3cca93a
 DIST haproxy-1.4.18.tar.gz 820427 RMD160 16729f0519a47123d88e849ae95d600c590c8583 SHA1 191dbcb5880c711580693bd081ca5fdd8dde3012 SHA256 ec2b6222a34d11f97cf7cf5cc696080dac34e94deb8e6cf3822b27442e0793fa
-DIST haproxy-1.4.8.tar.gz 778220 RMD160 617f5674c44dbf14b7ff8118c508e889f06c2afc SHA1 3b7a982ba7fb01d43826f5af5e95c86080ae0ca3 SHA256 707487ade815cbd37492d91a014f9a5b3ac313e5b4cb31e2d7c4d2a16f4a23f1
-EBUILD haproxy-1.3.25.ebuild 2003 RMD160 247a4bfbe29c67f5be6558ce20a080b1a9aa3bb0 SHA1 bc5a43a6375460c4173307922502703e51425d76 SHA256 dd9df176e0d5dc11ec192e3ef3ef4abb71065b87666efed8423f25f937f21d2c
-EBUILD haproxy-1.3.26.ebuild 2006 RMD160 1647aeca4563e93c9be09a2ebd1f15801fca17ef SHA1 431aa2aab7d404513d34647307ec63e46b6b2326 SHA256 5362e22133c55359f03d1fac1f22662e470568af047fe822588a8acd9a7c9362
-EBUILD haproxy-1.4.15.ebuild 2015 RMD160 08dfed1cf5ec97f989c6a75f25c7556ca9df1b67 SHA1 e19c84bb1182a52faff8991c2e6e92040eab3e58 SHA256 a7a9311806e411dfd646cc1374529fa89327c734bdf2f9fe163c1a9c60c57533
-EBUILD haproxy-1.4.18.ebuild 2016 RMD160 17c7fbddc6bd9d6920d5236eebc4d51f68529109 SHA1 2848f3b580195198b65c4cc630a41ce63d5add3f SHA256 a1820b13313d8baefc4e4a8cdd8f376bb30babe0a64100aca40f9fbbff4766cc
-EBUILD haproxy-1.4.8.ebuild 2002 RMD160 fd6b5188bd5a8906a302faee5ad9d410dca78ebf SHA1 dec48db1e95787323c4ed4a60ccd41d919f4b289 SHA256 8168a8d4439411a981ff0789688cb9f71d1fc9e5f700e235bfa1184a1b2e9902
-MISC ChangeLog 10007 RMD160 607234d9f0263cae2f51e8bcc017266e04465f1d SHA1 8ad35a47b945b0310e0cada6bf984c4375e6a1bf SHA256 f62a7f1bf516d8b67054cd030e57fcd37205cca274b1833b9c7e9446d76e9de7
+EBUILD haproxy-1.3.25.ebuild 2114 RMD160 a659cb1b4b5363587dcff5b0110d6e70de9fba6b SHA1 2459ba284afeb6e1b5fa7c9b48e1832dd7105aa4 SHA256 f1c490d64addccb658b225e4c8ff94d0537ef5411c96309d3fa820a5f14dc88b
+EBUILD haproxy-1.3.26.ebuild 2117 RMD160 53403476cc28b297f6fdeaea0334175a2b743d96 SHA1 bfd80e37e59e2d8898722625d7928c58c2953c38 SHA256 b6f22a2176dcd70305e6a5e41d1f76ac7a70d611e10bd09fa6ce2bd40fdd081e
+EBUILD haproxy-1.4.15.ebuild 2125 RMD160 46aae9d007aeb5f85073a158048fcb7041714fcb SHA1 ed62ad19e94f15cb72a4adcb50ebdbb122861c62 SHA256 e3d93b9bf710b0b354d2e8081a404aebbf64a31b573927949baec1f503fd1fef
+EBUILD haproxy-1.4.18.ebuild 2127 RMD160 1847e9cde0979b4cc3d3217db77cc610c95cceea SHA1 0f7f1988a44a00a0ca21f26adc7c9c96fd045c79 SHA256 99741767f4276f699dcc7c89354fe7b36650afc944626988e28f7fbd6a325d12
+MISC ChangeLog 10290 RMD160 8c928bcc8d799b3a53ee5a57343b926a372ed2ad SHA1 670c668f92fc1d3c85edf06eac865ac58d8a8707 SHA256 ce5cd53196fa63e36edf3784054db3c9b53f6cfcf420bcd67cc52f40160a48a5
 MISC metadata.xml 1450 RMD160 1e354be32e3ed9cbd5cd2b1aadbb9dd7772cd526 SHA1 035780ecce98f5856301af6e1633e11ce2bb5e8c SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOeLieAAoJEMOx0zmdw4Z1iBEH/iPv6rkt+oyaiT2Y1R54WqWr
-cTxPxtF/ert6cM6/Tg/OphtTV0ySpSJ346VH9TSZf/c2RaT4HSanX670rdW7nwtu
-QrplMIDl71iEP4YqG452YD5Rjpta4F0PLl6V3i9BgZ1/P5c9c9WtxNueqXzAVA7O
-1skXaqd6Z/AF5FmvrDkUlDJ6WFbEh9mTNjn6prwWGyUSbuPhi6XI2XxoprqXAux4
-o1rBQ+B/Va8n1p31VNWWWhpNfVflQF+l79R7/OE4/b3RKmGxfURORqgyMC0qEs2z
-Oc4Z45kR/F9giRjPVnmF+dtFEe21tMy8ExQRqYtgnnuHz6RtwyCTpbAJ3ae1j2g=
-=bCik
+iQEcBAEBCAAGBQJOeepaAAoJEMOx0zmdw4Z1H/IIAL6q/E0vw/eHTC+9XJ8CjZBt
+E0Bq2njda5DhdmoFeqV7X+DIKsM6seBbN/R9ti5gusDa58hz+Pgy/hbwkjvyKBW/
+QPCaAPCs8gYTSpI8XJSKGQXo1/SoT0zdat1u/fh3bJ6pML27JZoMgn0jQn2fEvet
+EhuR3cyAJ2EpD4pSpiq+iu0kTwjlF7UZatpXtO4IXLcIXlQvPH4YI10HUlDvgEan
+hklN3LBCev+cyPUZpUMHhLs2Kh6Azm7NmlsDj/Npg6XRxZOnPfoWVHZqfvXJ4h1l
+vLuu6T8FcM1t1HlTcM5CHciDb6zsadn1vZ7Mrz3ez+y95gLAnWgu6XEWSJJEXRI=
+=ygc+
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.3.25.ebuild b/net-proxy/haproxy/haproxy-1.3.25.ebuild
index e8a8329c53f6..bd1a86e53a15 100644
--- a/net-proxy/haproxy/haproxy-1.3.25.ebuild
+++ b/net-proxy/haproxy/haproxy-1.3.25.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.25.ebuild,v 1.5 2011/06/10 20:51:06 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.25.ebuild,v 1.6 2011/09/21 13:44:51 idl0r Exp $
 
-inherit eutils versionator toolchain-funcs
+inherit eutils versionator toolchain-funcs flag-o-matic
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -29,6 +29,9 @@ src_compile() {
 	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
 	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
 
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
diff --git a/net-proxy/haproxy/haproxy-1.3.26.ebuild b/net-proxy/haproxy/haproxy-1.3.26.ebuild
index e51466682129..f9a8a7a215e1 100644
--- a/net-proxy/haproxy/haproxy-1.3.26.ebuild
+++ b/net-proxy/haproxy/haproxy-1.3.26.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.26.ebuild,v 1.1 2011/09/04 16:12:21 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.26.ebuild,v 1.2 2011/09/21 13:44:51 idl0r Exp $
 
-inherit eutils versionator toolchain-funcs
+inherit eutils versionator toolchain-funcs flag-o-matic
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -29,6 +29,9 @@ src_compile() {
 	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
 	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
 
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
diff --git a/net-proxy/haproxy/haproxy-1.4.15.ebuild b/net-proxy/haproxy/haproxy-1.4.15.ebuild
index 641152938d9a..f861c9b1da6d 100644
--- a/net-proxy/haproxy/haproxy-1.4.15.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.15.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.15.ebuild,v 1.4 2011/07/23 11:26:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.15.ebuild,v 1.5 2011/09/21 13:44:51 idl0r Exp $
 
 EAPI="3"
 
-inherit eutils versionator toolchain-funcs
+inherit eutils versionator toolchain-funcs flag-o-matic
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -31,6 +31,9 @@ src_compile() {
 	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
 	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
 
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
diff --git a/net-proxy/haproxy/haproxy-1.4.18.ebuild b/net-proxy/haproxy/haproxy-1.4.18.ebuild
index 621fb1d03cc7..ab1388d5694c 100644
--- a/net-proxy/haproxy/haproxy-1.4.18.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.18.ebuild,v 1.1 2011/09/20 16:00:25 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.18.ebuild,v 1.2 2011/09/21 13:44:51 idl0r Exp $
 
 EAPI="3"
 
-inherit eutils versionator toolchain-funcs
+inherit eutils versionator toolchain-funcs flag-o-matic
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -31,6 +31,9 @@ src_compile() {
 	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
 	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
 
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
diff --git a/net-proxy/haproxy/haproxy-1.4.8.ebuild b/net-proxy/haproxy/haproxy-1.4.8.ebuild
deleted file mode 100644
index e32449a4c65d..000000000000
--- a/net-proxy/haproxy/haproxy-1.4.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.8.ebuild,v 1.5 2011/06/10 20:51:06 idl0r Exp $
-
-inherit eutils versionator toolchain-funcs
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples pcre vim-syntax"
-
-DEPEND="pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
-	local args="TARGET=linux26"
-
-	use pcre && args="${args} USE_PCRE=1"
-
-	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
-	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
-}
-
-src_install() {
-	dobin haproxy || die
-	newinitd "${FILESDIR}/haproxy.initd" haproxy || die
-
-	# Don't install useless files
-	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
-	doman doc/haproxy.1
-
-	if use examples;
-	then
-		docinto examples
-		dodoc examples/*.cfg || die
-	fi
-
-	if use vim-syntax;
-	then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${ROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}