Version bump. Make init script POSIX compliant (#172554).

Package-Manager: portage-2.1.2.2

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 7ee85497124cc7055d49fc8e3f5555f2c1518a0a..ada0b4ebbda4dace7154367e64aa51d5f2c52398 100644 (file)
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.5 2007/01/09 22:11:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.6 2007/03/30 08:47:21 mrness Exp $
+
+*haproxy-1.3.8 (30 Mar 2007)
+
+  30 Mar 2007; Alin Năstac <mrness@gentoo.org> files/haproxy.initd,
+  -haproxy-1.2.15.ebuild, +haproxy-1.3.8.ebuild:
+  Version bump. Make init script POSIX compliant (#172554).
 
   09 Jan 2007; Robin H. Johnson <robbat2@gentoo.org> haproxy-1.2.16.ebuild:
   Add ~ppc and ~amd64.

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index f3f7192f66829bf2e0e338c302edc38cb114d94a..75aef35d94327765aea08b790e2f5a1d6c57ba2f 100644 (file)
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,28 +1,38 @@
-AUX haproxy.initd 756 RMD160 661f778f58531bd2ee971283f644fd224b640701 SHA1 7eb3b11518e098d8d6769b2d9eecf8a53826de17 SHA256 91c8f45da03dc248324ce0a3c57fb67185714ea547c6a10d8804587cc8c8f381
-MD5 cff688b267b894a8021ba718c1788442 files/haproxy.initd 756
-RMD160 661f778f58531bd2ee971283f644fd224b640701 files/haproxy.initd 756
-SHA256 91c8f45da03dc248324ce0a3c57fb67185714ea547c6a10d8804587cc8c8f381 files/haproxy.initd 756
-DIST haproxy-1.2.15.tar.gz 248300 RMD160 47cc98f2cca5fbfd78825388ca8a24931b5d7e08 SHA1 ffad754aeea1c674e54a10451da37b301fb4907f SHA256 196fa8762dc644cbe97f9abf16c260d342b4a0f1e90446a413b839c6aae4db77
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX haproxy.initd 753 RMD160 1f46ddda90599de303da2df4014a1c9628ae957d SHA1 d59aa2eeba3c441750a689d2e6e50ccbca935e68 SHA256 0a1a63e439fbf153c2e7a75cebefd3e8ec05fa17112b76bd981def590b6639fd
+MD5 294d49e9bae1fbcf784a7f5feb14f0eb files/haproxy.initd 753
+RMD160 1f46ddda90599de303da2df4014a1c9628ae957d files/haproxy.initd 753
+SHA256 0a1a63e439fbf153c2e7a75cebefd3e8ec05fa17112b76bd981def590b6639fd files/haproxy.initd 753
 DIST haproxy-1.2.16.tar.gz 197867 RMD160 f9fde12bd4d9ef3397c5f56f6ba679d8d65699c2 SHA1 96df1ed2b517123d986570e23380d39560064dd2 SHA256 c8635aaf761f3bb74676d6cbc1ebb415cdcebebcdb46261a737a7d69c4251f2f
-EBUILD haproxy-1.2.15.ebuild 1298 RMD160 350174a7688c9b1b42b09a279ed5f606cd61beb0 SHA1 4b3f8311d0cda5355ad085107c59c3c42408142e SHA256 13949e463fbc6fa93e41b981919edc0cce1b3757e1408033e02a41e1307a613d
-MD5 bf3312c0e2ce2fcb748ea9f4587cfa1f haproxy-1.2.15.ebuild 1298
-RMD160 350174a7688c9b1b42b09a279ed5f606cd61beb0 haproxy-1.2.15.ebuild 1298
-SHA256 13949e463fbc6fa93e41b981919edc0cce1b3757e1408033e02a41e1307a613d haproxy-1.2.15.ebuild 1298
+DIST haproxy-1.3.8.tar.gz 294058 RMD160 316a957217cd1fd40fa3c403aee6e3bce67304e4 SHA1 58806fd20a606f6b8bc64dab373ce9151d5f23fa SHA256 2f2f71dfa58d531052630aa9eefe6942906fbe5609cef0610da0dbaaae2ab28b
 EBUILD haproxy-1.2.16.ebuild 1311 RMD160 00829131ba64ea9551339539c75d41d4d87c477e SHA1 227c482ccbd40a682f57892f013f70b54ba9a162 SHA256 bb8dc7e3d7897febc5e5f51e79d30789d8af2e6bcc84a8cfdb17ccce5f5cb9f7
 MD5 933537284adfe503624ab17fd0e0c821 haproxy-1.2.16.ebuild 1311
 RMD160 00829131ba64ea9551339539c75d41d4d87c477e haproxy-1.2.16.ebuild 1311
 SHA256 bb8dc7e3d7897febc5e5f51e79d30789d8af2e6bcc84a8cfdb17ccce5f5cb9f7 haproxy-1.2.16.ebuild 1311
-MISC ChangeLog 814 RMD160 0e9378304ac17a533c32c92259554b1670a8972c SHA1 fdd4bed6639f0f17e33917b33a299e025a250cb1 SHA256 89d7b26b9b0f1bcda7ae5221cfc1b36368a3f3c22bde84331bb7e4c53d752edb
-MD5 87f6605f1963beade3726d85dc238135 ChangeLog 814
-RMD160 0e9378304ac17a533c32c92259554b1670a8972c ChangeLog 814
-SHA256 89d7b26b9b0f1bcda7ae5221cfc1b36368a3f3c22bde84331bb7e4c53d752edb ChangeLog 814
+EBUILD haproxy-1.3.8.ebuild 1367 RMD160 6585c797740cfed343e8de3429274317600833e7 SHA1 abd928e2f8a2c6c74bb9a7e43a6e5e1f28c1b503 SHA256 01abef572406afa2cf18528fc148684491a8744fd2245225b85f1843389f6334
+MD5 119371c2ab6b11243eb95a4ef7fedb0f haproxy-1.3.8.ebuild 1367
+RMD160 6585c797740cfed343e8de3429274317600833e7 haproxy-1.3.8.ebuild 1367
+SHA256 01abef572406afa2cf18528fc148684491a8744fd2245225b85f1843389f6334 haproxy-1.3.8.ebuild 1367
+MISC ChangeLog 1022 RMD160 11ff151d4931c9ab15ca3b2df5993c99ac0cecf6 SHA1 46261ca651ea504e78c9448c650bfa08a83a549f SHA256 638cd09d35ce3145cee52d9652817297288a40efa86acca1dd6c420a4aa78ff6
+MD5 ca353f074d305b2d25249f3955b69eda ChangeLog 1022
+RMD160 11ff151d4931c9ab15ca3b2df5993c99ac0cecf6 ChangeLog 1022
+SHA256 638cd09d35ce3145cee52d9652817297288a40efa86acca1dd6c420a4aa78ff6 ChangeLog 1022
 MISC metadata.xml 929 RMD160 5165e64077d97077bfd334036f3a6c50defacfbe SHA1 1df1db8e4ded2e77dc7dc8b500c013e27bde027d SHA256 f59d153f4707b2195eb319ac40844a2c264a3231656fa75846a5d33422b9f6a4
 MD5 6710b828e4b6762de067c846f321c403 metadata.xml 929
 RMD160 5165e64077d97077bfd334036f3a6c50defacfbe metadata.xml 929
 SHA256 f59d153f4707b2195eb319ac40844a2c264a3231656fa75846a5d33422b9f6a4 metadata.xml 929
-MD5 de61f41d4463c7ea5393cab392355f83 files/digest-haproxy-1.2.15 244
-RMD160 3e969cf717f8b3a6cfaea940492d75fc30382a40 files/digest-haproxy-1.2.15 244
-SHA256 f0e961ad11fb9450d1d77d5195f4c24f060e0782887e2ac3c580e95391e144b8 files/digest-haproxy-1.2.15 244
 MD5 c28a0bb769034a99dd4ec2a472625f9d files/digest-haproxy-1.2.16 244
 RMD160 79b4faa33b065c5817fecfce65f41f8bfba2f5a4 files/digest-haproxy-1.2.16 244
 SHA256 c177f5ba6574a28b70cde2110da958763f5e750f0b09c449c90dc1a8dd7ac397 files/digest-haproxy-1.2.16 244
+MD5 f05c14b22fe12145b7c7f80e7d0ffd25 files/digest-haproxy-1.3.8 241
+RMD160 93362be8b00cc62c7c967584dc9485fb43207929 files/digest-haproxy-1.3.8 241
+SHA256 4bcfdfb30323d894735f9030753210b19a6dec690b1cfa28eafcddf438b49f53 files/digest-haproxy-1.3.8 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGDM6fJnxX6mF440QRAjW4AKCXOHKzvaNyPlWwwZ/uaITpVJEo6gCgv4eH
+A+78a9BecQYswh2IOppytsc=
+=Rbi4
+-----END PGP SIGNATURE-----

diff --git a/net-proxy/haproxy/files/digest-haproxy-1.2.15 b/net-proxy/haproxy/files/digest-haproxy-1.2.15
deleted file mode 100644 (file)
index 597b962..0000000
--- a/net-proxy/haproxy/files/digest-haproxy-1.2.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7461a3deeda099a6ee190f99e9763fea haproxy-1.2.15.tar.gz 248300
-RMD160 47cc98f2cca5fbfd78825388ca8a24931b5d7e08 haproxy-1.2.15.tar.gz 248300
-SHA256 196fa8762dc644cbe97f9abf16c260d342b4a0f1e90446a413b839c6aae4db77 haproxy-1.2.15.tar.gz 248300

diff --git a/net-proxy/haproxy/files/digest-haproxy-1.3.8 b/net-proxy/haproxy/files/digest-haproxy-1.3.8
new file mode 100644 (file)
index 0000000..0aa9139
--- /dev/null
+++ b/net-proxy/haproxy/files/digest-haproxy-1.3.8
@@ -0,0 +1,3 @@
+MD5 0ed3085637846cb3045638d12f076c8f haproxy-1.3.8.tar.gz 294058
+RMD160 316a957217cd1fd40fa3c403aee6e3bce67304e4 haproxy-1.3.8.tar.gz 294058
+SHA256 2f2f71dfa58d531052630aa9eefe6942906fbe5609cef0610da0dbaaae2ab28b haproxy-1.3.8.tar.gz 294058

diff --git a/net-proxy/haproxy/files/haproxy.initd b/net-proxy/haproxy/files/haproxy.initd
index 9126994a8b4df149845e6cf654b156607e5ce968..ac4c3de3eeb6ef1b600f1d2a8df5ddca63a95ebd 100644 (file)
--- a/net-proxy/haproxy/files/haproxy.initd
+++ b/net-proxy/haproxy/files/haproxy.initd
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.1 2006/06/11 14:05:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.2 2007/03/30 08:47:21 mrness Exp $
 
 checkconfig() {
-       if [[ ! -f /etc/haproxy.cfg ]] ; then
+       if [ ! -f /etc/haproxy.cfg ]; then
                eerror "/etc/haproxy.cfg does not exist!"
                return 1
        fi

diff --git a/net-proxy/haproxy/haproxy-1.2.15.ebuild b/net-proxy/haproxy/haproxy-1.3.8.ebuild
similarity index 70%
rename from net-proxy/haproxy/haproxy-1.2.15.ebuild
rename to net-proxy/haproxy/haproxy-1.3.8.ebuild
index 4f85a339599b2853eb09972f3eebacbc6291a0ac..c893da782f0135dcc8bce83000a402b8fd0756e1 100644 (file)
--- a/net-proxy/haproxy/haproxy-1.2.15.ebuild
+++ b/net-proxy/haproxy/haproxy-1.3.8.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.2.15.ebuild,v 1.1 2006/09/20 11:41:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.8.ebuild,v 1.1 2007/03/30 08:47:21 mrness Exp $
 
 inherit linux-info
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/1.2/src/${P}.tar.gz"
+SRC_URI="http://haproxy.1wt.eu/download/${PV%.*}/src/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="pcre"
 
 DEPEND="pcre? ( >=dev-libs/libpcre-6.3 )"
@@ -26,9 +26,12 @@ src_install() {
        doexe haproxy
        newinitd "${FILESDIR}/haproxy.initd" haproxy
 
-       dodoc CHANGELOG ROADMAP TODO doc/*
+       # Don't install useless files
+       rm examples/build.cfg doc/*gpl.txt
+
+       dodoc CHANGELOG ROADMAP TODO doc/*.txt
        docinto examples
-       dodoc examples/examples.cfg examples/haproxy.cfg
+       dodoc examples/*.cfg
 }
 
 pkg_postinst() {