Version bump. Cleanup

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 66 insertions, 42 deletions

diff --git a/net-libs/libwhisker/ChangeLog b/net-libs/libwhisker/ChangeLog
index cdfd42a577f0..2b88b4283cbb 100644
--- a/net-libs/libwhisker/ChangeLog
+++ b/net-libs/libwhisker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libwhisker
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwhisker/ChangeLog,v 1.13 2007/02/09 04:32:50 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwhisker/ChangeLog,v 1.14 2010/02/20 09:02:59 tove Exp $
+
+*libwhisker-2.5 (20 Feb 2010)
+
+  20 Feb 2010; Torsten Veller <tove@gentoo.org> -libwhisker-2.2.ebuild,
+  +libwhisker-2.5.ebuild, metadata.xml:
+  Version bump. Cleanup
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-libs/libwhisker/Manifest b/net-libs/libwhisker/Manifest
index c1e6b2420956..862cfc217319 100644
--- a/net-libs/libwhisker/Manifest
+++ b/net-libs/libwhisker/Manifest
@@ -1,4 +1,14 @@
-DIST libwhisker2-current.tar.gz 94446 RMD160 ee06ee4408487b60e923e28407f899d405325c0d SHA1 b9b43377c1a1c7edf2ea2b7c19c9f7fce00cc0ce SHA256 157284648137fd9314575ce3b868a8c7db121faef6ea2205d1082d05450a0b98
-EBUILD libwhisker-2.2.ebuild 810 RMD160 e72d32146a4aac38f32af5da7d0e346954617834 SHA1 e611955dd6bdceb1c334f57309400db790a655ae SHA256 895e5239c845ec36c0d19ff4fdd500601b09a8916f7810a5510a3be255434672
-MISC ChangeLog 2836 RMD160 edde9d9bb1c50c869903a1aba2c1cd810e1632e9 SHA1 afc39d46fd6ef4e52e3daa706fc8d7bcddf04452 SHA256 b8d9c5f9301bbfd6dc453e02959df1cd104d6e908a622a16c9aa0861a2981683
-MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libwhisker2-2.5.tar.gz 207569 RMD160 fd8dc1552499119f3e7086860e9cbbfaf3bf6c25 SHA1 e5810210ed6adefadac028700d3e18b451215b3b SHA256 f45a1cf2ad2637b29dd1b13d7221ea12e3923ea09d107ced446400f19070a42f
+EBUILD libwhisker-2.5.ebuild 760 RMD160 ddd2f614a8b3751c54c581361f5252bc92708d58 SHA1 ff78a8b6dc15a82d203b785f85a164ae6c3a399b SHA256 1d2bed137df3f43c366c4d76181119a6d7eb67236e9aafa8554b0db66c72dfbc
+MISC ChangeLog 2999 RMD160 46b25feced2fa612cf7550370692406749e6b742 SHA1 89db1a30a4c3b1b9248bfe06bdfd31c5b4dc8eaa SHA256 74068c1e8eeafbb6d45690e2c9925a233b11ad44cc9067107438a7dd26e5c8a5
+MISC metadata.xml 747 RMD160 460afdb88f58a51281d23fdf10b1f65af2dacf15 SHA1 aa1ca1e42e70deb1508550a6b36dc56c1684ac88 SHA256 9f1ea8f6b571e11b2ed108b423470ea706569bb2454b7a150dae28e73d02f567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt/pUgACgkQV3J2n04EauxpTQCfVm4XqvU5MBq1IyDj6Sq6QDnm
+QCUAoL0T1sSUhmSSQp+lAS0AiA9vp9RN
+=JEPh
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libwhisker/libwhisker-2.2.ebuild b/net-libs/libwhisker/libwhisker-2.2.ebuild
deleted file mode 100644
index 709c2132d151..000000000000
--- a/net-libs/libwhisker/libwhisker-2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwhisker/libwhisker-2.2.ebuild,v 1.3 2005/03/13 20:38:32 mcummings Exp $
-
-MY_P="${PN}2-current"
-S="${WORKDIR}/${PN}2-${PV}"
-DESCRIPTION="Perl module geared to HTTP testing."
-HOMEPAGE="http://www.wiretrip.net/rfp/"
-SRC_URI="http://www.wiretrip.net/rfp/libwhisker/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
-IUSE="ssl"
-
-DEPEND=">=dev-lang/perl-5.6.1
-		ssl? ( >=dev-perl/Net-SSLeay-1.19 )"
-
-src_compile() {
-	cd ${S}
-	perl Makefile.pl lib
-}
-
-src_install() {
-	cd ${S}
-	vendor_perl=`perl -e 'use Config; print $Config{installvendorlib}'`
-	dodir ${vendor_perl}
-	insinto ${vendor_perl}
-	doins LW2.pm
-	dodoc docs/* scripts/*
-	dohtml LW.html
-}
diff --git a/net-libs/libwhisker/libwhisker-2.5.ebuild b/net-libs/libwhisker/libwhisker-2.5.ebuild
new file mode 100644
index 000000000000..d09e0afb9462
--- /dev/null
+++ b/net-libs/libwhisker/libwhisker-2.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwhisker/libwhisker-2.5.ebuild,v 1.1 2010/02/20 09:02:59 tove Exp $
+
+EAPI=2
+
+inherit perl-module
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="Perl module geared to HTTP testing"
+HOMEPAGE="http://www.wiretrip.net/rfp/lw.asp"
+SRC_URI="http://www.wiretrip.net/rfp/libwhisker/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND=""
+RDEPEND="virtual/perl-MIME-Base64
+	ssl? ( dev-perl/Net-SSLeay )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	perl Makefile.pl lib || die
+}
+
+src_install() {
+	perlinfo
+	insinto "${VENDOR_LIB}"
+	doins LW2.pm || die
+	dodoc CHANGES KNOWNBUGS README || die
+}
diff --git a/net-libs/libwhisker/metadata.xml b/net-libs/libwhisker/metadata.xml
index 86672fe64c10..74dec4574fe6 100644
--- a/net-libs/libwhisker/metadata.xml
+++ b/net-libs/libwhisker/metadata.xml
@@ -2,9 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+	<longdescription>
+		Libwhisker is a Perl library useful for HTTP testing scripts.  It
+		contains a pure-Perl implementation of functionality found in the LWP,
+		URI, Digest::MD5, Digest::MD4, Data::Dumper, Authen::NTLM, HTML::Parser,
+		HTML::FormParser, CGI::Upload, MIME::Base64, and GetOpt::Std modules.
+		Libwhisker is designed to be portable (a single perl file), fast
+		(general benchmarks show libwhisker is faster than LWP), and flexible
+		(great care was taken to ensure the library does exactly what you want
+		to do, even if it means breaking the protocol).
+	</longdescription>
 </pkgmetadata>