Cleanup

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

5 files changed, 14 insertions, 249 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 32683ddf2118..3aa77c51fe1c 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/haproxy
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.74 2012/12/29 03:03:45 idl0r Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.75 2013/04/02 20:30:32 idl0r Exp $
+
+  02 Apr 2013; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.4.21.ebuild,
+  -haproxy-1.5_beta15.ebuild, -files/haproxy.initd-r1:
+  Cleanup
 
   29 Dec 2012; Christian Ruppert <idl0r@gentoo.org> haproxy-1.4.21.ebuild,
   haproxy-1.4.22.ebuild, haproxy-1.5_beta15.ebuild, haproxy-1.5_beta17.ebuild:
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index d7fd71a0f06f..f82b3020755b 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,26 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX haproxy.initd-r1 1157 SHA256 5412580888ae334974d6af99a137adb9abbbc8ecd807c45c906058160b570de1 SHA512 83c5043dd894906f7363086ccb30e6eb159a91bb5f4c60535047f15cfda5b0c4d955701f0fe059a6edd9518a267ab5d98f977de5b65bd35436323527172f282a WHIRLPOOL 3bb1b51fe0f91e2c11a2edd48d02a98091b43c237ae71a3045190f2d92ecc38b987f906e6b6fe49370f168aa32c276c88e2eafa225a739800d2da87f1cd07a4f
 AUX haproxy.initd-r2 1095 SHA256 0136fbcbb9e7c77dfade5a4b0f28522a11f15c84fb0bb79f5f486f6baf00a0c4 SHA512 32c5a78a6545c7357ae4b81d8b236ae7569a6ca55171c7560089d345a7a8ba7d2df2083fc7c43b72031a0f8ad1e5151990530ce7b4d2c967dd959bd0ee542ee5 WHIRLPOOL e5c251617d938f07c9dcdb3008f8ec050bedd9c2dccdd63b4c83d8367795e24be79a1f394808f530f908f0147f72b7a6794a75a240d26d9d23285265f496f1b4
-DIST haproxy-1.4.21.tar.gz 827392 SHA256 6e28575f0492def31c331faf9ead08225dd62153334880688f8a7c477c8c31a4 SHA512 68dc0604a102b3848516511f8dcd6cf6f52e7de5e64437ab2b2f735b62ce35a476894a9accbec7e27682579a1d5ebc2896b12d67faa3e94e8786fbc2b37a111e WHIRLPOOL a67921ba843f1b2978b2b7adb3914d62858d60cec6ab776e253223ea8478e2609e888dd6e3d9ec11d362f6a65109da6027c2223989f9eb2821ee262b42024ba0
 DIST haproxy-1.4.22.tar.gz 831791 SHA256 ba221b3eaa4d71233230b156c3000f5c2bd4dace94d9266235517fe42f917fc6 SHA512 a436aeacbda4dcc3de09250187e22589c1c71dda7d77f5b2cf33bfdaaa443fc5b2d9ab6d57085296fde7581ea8cc1d04408569e70879f96687bc3151120a9afa WHIRLPOOL dbef99d77c122c889d95756f227f873c01b3052c3a4c9be57a311321bf36aaa39913a930bcdd2272a3baa3a1dec16e6afc87f52e15df57dd2888446e5a725b55
-DIST haproxy-1.5-dev15.tar.gz 1095962 SHA256 417d746c6ff179b290410b8640b699a5f2b98cdb916ace4656d7d1ea79880047 SHA512 bde924a53c40b3a9624e94ca53da3c22963e7015441331868fe689559416470bf2d397e3af87e7f0bc8e34cbd5eec5d36f777fe6a6ec2ae020aee9f2b0fe33a8 WHIRLPOOL 0ece061ccb8483b3e09e4e00d68dee2e0fade282021e710c67ceab77671c8f53524e2b170bf3d74b3364a49d255b6f81c7d07c20a3f034871ba3d3ad42321455
 DIST haproxy-1.5-dev17.tar.gz 1104398 SHA256 d0371b2eb78dff419e2bf642ffab533c3f13e7216bdb92ba08f65a5e4652e7db SHA512 6aba040fc4ce88df880d791b88f6f9a6258838fee8609c9b08c4b3c47034a6809441822420f89e532f887b541333330e3ae79b7a44e256715b0f842956bd319e WHIRLPOOL cb6badb35c57fa60d53b4c8cdbfbe9b7ccbd87216b16c9dc0ef80e4ce18fd6b26bcf442e9de6848fddb1f37b577f30525740b2b62d91807d084361754dac8810
-EBUILD haproxy-1.4.21.ebuild 2126 SHA256 1bc272002f318de52c302b4bcb963cea36e65c57b6e5ed44631858bc9a6bd863 SHA512 fa53520d2e52537a978131d305329eb9d68c5c3de64b02ff1a36691d42c849a7ffbe113594c8cecc7dd9ab943a10fb4d8c611e44c89cd6013caa450464e6417e WHIRLPOOL f7b490dfff8f9a4507470de026a96fceb9bb322f1db12a3ae89107a159efa42755e39c4965613525da6f7710c5e3b7592be7577bba7db726f236c4fc49e8edcf
 EBUILD haproxy-1.4.22.ebuild 2316 SHA256 a7b9619f36a701261d604c8534e3b41abb9a2fa64874f4df7af1c107dfdc6c3d SHA512 9ff059210ad9469711d7dfb36271da705ba621a0916834d23401d9b6fcff5f046e97849d0ab4ad3111da3a27c4c4d731e49df2b9084eb3ada7eca5d30433a003 WHIRLPOOL 95d1fcb00e32fcd092261bf064d43893c26cf1ecd4fe159248e2e237b6358a0febf2c0c147762968790bed2d3704f58c2001ef78768861a886535977d130763a
-EBUILD haproxy-1.5_beta15.ebuild 2650 SHA256 3117bdb2ab7e5a1b3f67a6e0cbe5e266d49f788f3845eeac7967b017b3c4aaec SHA512 b3347a62e9d51302dd86aa089e17707d0abd57b21c6b85ae537f6319278bc0196f97ca3aab8b7ed4c23d803ba2982c0cbffc5ee81ece00391ed32ec3670a9d42 WHIRLPOOL f0392c945981351514a6c6a89ce1b3ac2746574dd49852f4c74d853b012e4d58bc02765ffb0a7cad5a66fa9ef8d68733ce7389014eddd115990cbe3e557d6b79
 EBUILD haproxy-1.5_beta17.ebuild 2650 SHA256 620bcf25a323b4f572305cca95c7c922f1f9a18a4c7ee778cd42fad2a45119a5 SHA512 3e76ac5798597d8ff6688a94b7febee1f0b285d61682f5f0b0a4647d68ef914911813876a4624b11c54bd7bf35b76b63892e508249abc35dba1ae252fc4ec439 WHIRLPOOL 850694f1e73d22652c40fc55f30d27852045fa5380ec106a47505862611916cc93a1fa343997ae378dfc93b3b4eb2acc8c2562df9f53f07c04272d0607aed097
-MISC ChangeLog 13209 SHA256 84a92856eb49fca375c4da469bf7a1adb2cfeec374a40ca36b0d39005668597d SHA512 edc8425b39195459f5a95d0013acd14ecbba89b133dd9d535c845b0d82adc36ead80af5a3dacbb656ba09a871830884d1a16371a6d073909c498169d3ce23145 WHIRLPOOL 275faaef69c4384f809078a1395b0248542b9ca9b4593373129811eef518e9cdf873b578f64a07c39f8d5218da3e35d0a83feb6dd929ca3aefda9fa2ca20487b
+MISC ChangeLog 13351 SHA256 45ef2c56cace2f49e43b135f4bad8543dba4019cc8912060fff73f7f63c98344 SHA512 64ca706928d81d03cc20656ef43b58cfc51b87ab0f6148bbdc5c6b9c1a36a3e96cf81571748771c0bd5e51e9ae10810305943ad0fc1e65d3dfd9be1942f1bbb4 WHIRLPOOL 47502f56694f6b493f1b13870570604cecdb75ef8e1471221080d48cb0ca8bca36a2e88f6c3002a2b1baabc434332a45aafaf7926703774293002de24a66e105
 MISC metadata.xml 1450 SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4 SHA512 9e97e0524ea16e789883c739951ea017f66502574e5e5340ab6bfd3765239fc7ccf660a0a0cfee8dc8884247b588b02c11f63961efa7a05f32152ac32a157eba WHIRLPOOL 8b23ebe3a8f2e3c8e2bade35f777241514675337c6b30f6507341452c809b94d4df2a3f5ffb496e4f30293319fde2dd90666e701ac57c0b2f7d3522ff00540c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3l2UAAoJEMOx0zmdw4Z1w4kH+wRko37H3ZsHramiZjHEBJkf
-SEC88SV93mbXw+4j3PeMn19M3ZFDExCjxxmW55OUeBkioAfTtw68HsUPLuWrnQ7D
-B5zYTBAOASsi8V2ixVQBgKQdMt41RgAX0/9LTF5gq7rKuLIATe88M+L0/qTksFaE
-F8KpHpc7nXDrB7cvZNHc5efUty7gmO7IjVQgaUCLu0LkJlk+D2Nx5eZPYHBiNyMc
-c0j+QUll80gA5LZ9q//Vvs0rdVxQh5NqwmsQYsqcJ9QSh9kJaO+pXQLQ82MFmhQF
-r+FzqTszM/e9Ms89M6MrCJZqi6CFAkRMSpgaYpAZN7bErlDUC01PSM8mPIvvxtk=
-=wSo+
+iQEcBAEBCAAGBQJRWz/qAAoJEMOx0zmdw4Z1a9AH/3ORxSvQIi6gpRqwqQVy8XSd
+ZF+v/Q27FBB2G9Ke2GLP2waq09wi/PuchuOjQaqV9Kx7hpKBDaE0nwOrSKVarEAc
+YDydx8fs54eXj2Xa2II4jalMntSk09W6K7ZQi3NdKauehWDa57WNwwHDYGwHiYiX
+TGbxu54cS8u+kZpJ+nCnfXy6+wKKvKTSGmA02vPFR4XiPi8y/C/cK3+a09T1wib2
+6nUC5/bDZwlUxsUTr+hKEbNZvsu3WZcBBfw6e/RB9iw6ldXb8iVB5XUBK43FRsKw
+DNBWl+H5KombtLdvZkGxL4M7UMz5bty9IWT/QP26ZQDHNtprTfnPWWPyGf/SgRQ=
+=PXuM
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/files/haproxy.initd-r1 b/net-proxy/haproxy/files/haproxy.initd-r1
deleted file mode 100644
index 7c2b76ffa8f2..000000000000
--- a/net-proxy/haproxy/files/haproxy.initd-r1
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd-r1,v 1.2 2011/12/04 10:32:32 swegener Exp $
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-CONFFILE=/etc/${SVCNAME}.cfg
-PIDFILE=/var/run/${SVCNAME}.pid
-
-depend() {
-	need net
-	use dns logger
-}
-
-checkconfig() {
-	if [ ! -f "${CONFFILE}" ]; then
-		eerror "${CONFFILE} does not exist!"
-		return 1
-	fi
-
-	ebegin "Checking ${CONFFILE}"
-	/usr/bin/haproxy -q -c -f "${CONFFILE}"
-	eend $?
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --pidfile "${PIDFILE}" --exec /usr/bin/haproxy \
-		--start -- -D -p "${PIDFILE}" -f "${CONFFILE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-
-	if [ "${RC_CMD}" = "restart" ]; then
-		checkconfig || return 1
-	fi
-
-	start-stop-daemon --stop --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; }
-	/usr/bin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}")
-	eend $?
-}
diff --git a/net-proxy/haproxy/haproxy-1.4.21.ebuild b/net-proxy/haproxy/haproxy-1.4.21.ebuild
deleted file mode 100644
index 9388ae8059a7..000000000000
--- a/net-proxy/haproxy/haproxy-1.4.21.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.21.ebuild,v 1.5 2012/12/29 03:03:45 idl0r Exp $
-
-EAPI="4"
-
-inherit user versionator toolchain-funcs flag-o-matic
-
-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"
-
-	# 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
-}
-
-src_install() {
-	dobin haproxy || die
-
-	newinitd "${FILESDIR}/haproxy.initd-r1" 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
-}
diff --git a/net-proxy/haproxy/haproxy-1.5_beta15.ebuild b/net-proxy/haproxy/haproxy-1.5_beta15.ebuild
deleted file mode 100644
index 20fe9443f2c0..000000000000
--- a/net-proxy/haproxy/haproxy-1.5_beta15.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta15.ebuild,v 1.2 2012/12/29 03:03:45 idl0r Exp $
-
-EAPI="4"
-
-inherit user versionator toolchain-funcs flag-o-matic
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-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/devel/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+crypt examples +pcre ssl vim-syntax +zlib"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-	ssl? ( dev-libs/openssl[zlib?] )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
-	local args="TARGET=linux2628 USE_GETADDRINFO=1"
-
-	if use pcre; then
-		args="${args} USE_PCRE=1"
-	else
-		args="${args} USE_PCRE="
-	fi
-
-#	if use kernel_linux; then
-#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
-#	else
-#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
-#	fi
-
-	if use crypt; then
-		args="${args} USE_LIBCRYPT=1"
-	else
-		args="${args} USE_LIBCRYPT="
-	fi
-
-	if use ssl; then
-		args="${args} USE_OPENSSL=1"
-	else
-		args="${args} USE_OPENSSL="
-	fi
-
-	if use zlib; then
-		args="${args} USE_ZLIB=1"
-	else
-		args="${args} USE_ZLIB="
-	fi
-
-	# 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
-}
-
-src_install() {
-	dobin haproxy || die
-
-	newinitd "${FILESDIR}/haproxy.initd-r2" 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
-}