Remove old versions.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

5 files changed, 9 insertions, 178 deletions

diff --git a/net-im/prosody/ChangeLog b/net-im/prosody/ChangeLog
index 02ea28bf95be..df64dc2b008d 100644
--- a/net-im/prosody/ChangeLog
+++ b/net-im/prosody/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/prosody
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.13 2011/06/06 11:42:39 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.14 2011/06/06 11:44:26 djc Exp $
+
+  06 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> -prosody-0.7.0.ebuild,
+  -files/prosody-0.7.0-cfg.lua.patch, -prosody-0.8.0.ebuild:
+  Remove old versions.
 
 *prosody-0.8.1 (06 Jun 2011)
 
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index c35d2dcd1f38..6d9e647c9eeb 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX prosody-0.7.0-cfg.lua.patch 1517 RMD160 ea1e8459c61d93e1b196177a42f089e153c79f8e SHA1 635bdc90428249d5846eabaf7cb8bac975dee3c5 SHA256 5bc54faaf365be5a3568f201fa53f0ff094bb51bb4d8300cdca60ec8aaffb4e8
 AUX prosody-0.8.0-cfg.lua.patch 1478 RMD160 afc3b4dcf038dc305d8e194d14cb3ce3e3384081 SHA1 aff62afc9ffdcc24d1319a96df59ffde3b214b4c SHA256 a09043584dbbe69812716204c83d4f901a25b5c51835b04f014386c8e8febb87
 AUX prosody.initd 1148 RMD160 54de6d4b97600024cfd8624fa10240a1e0a430e8 SHA1 c75e361c36e27adc880517d02a0e3089f200fd97 SHA256 e520a55d4a10fc7fce24ce7b57e722846d2814e6726407acba606af519de19e8
-DIST prosody-0.7.0.tar.gz 177412 RMD160 2e40b4f807b6120971c611f52d4df3264a82cbb9 SHA1 3f3a6c4f262a062a9c027cc843cd6827104fb8ba SHA256 a8b826805dd55282706c5683c2028899b3721eb0f84d3e35c0509a6c1bc32390
 DIST prosody-0.8.0.tar.gz 210945 RMD160 98817b1f40c6fd9ab402b70f73dae308e5990cdc SHA1 f20baab36bd2570825a24f49e0643cb9c2a65541 SHA256 0b9e39a6b555b4c848af288f27107e99b1480d9733556a2c9b3a9f249eba602d
 DIST prosody-0.8.1.tar.gz 211970 RMD160 d0b357fb0a9e8ba77b0f45f6342172e262ec018b SHA1 7de714c019eca35346300c61d609ad2ce999b692 SHA256 6d6db07975f82adece05fb01fc6f448230d6b9c871d6f6d8259d68d4f2d72886
-EBUILD prosody-0.7.0.ebuild 1876 RMD160 f8631649cb4227091f2841c89e1b74ca3ab4e5be SHA1 a9d0d51c9a07873d68dcfeaf7531df9589fa8830 SHA256 9de2b14209f491bb06b7bcc022b4769b1c2307fdbf4a2803e00a1293047f4282
 EBUILD prosody-0.8.0-r1.ebuild 2140 RMD160 f54b4f389c80b5a2dd011d65efca27ac6a09556e SHA1 95d5bbdcd7c681f77812d05f5028eaf0489df551 SHA256 20416c80dd14398f39f099bbb3f8326e6b460954dea3bc57ac50c810d1062cb6
-EBUILD prosody-0.8.0.ebuild 2103 RMD160 23b7a1912460520ef6fd35bec89723d7faddb963 SHA1 faa48a9d42ea84b778c4f3c93c8c4477cd2dead9 SHA256 e3738e1bc1507af7fbd375b4c01008153c61471015fe9f51bd0b6b99c34df944
 EBUILD prosody-0.8.1.ebuild 2254 RMD160 9ba2a070cbf9a5f7bf208404a623b2a068373bd0 SHA1 0600198b30ede5eb99558c138b7ee857cf17f913 SHA256 79154adb4483da2a115270490e0e12b1a7e6bef126485bad88585bb0f0cd636e
-MISC ChangeLog 2189 RMD160 d2670ecfe6bbad2131baf7b052a0ad55aea11d52 SHA1 94c0d64dc9de6b9dd710367b7eb171788e897fb0 SHA256 327b21770d24bb0abf3a096940b0b9ee21e0979acf1ae7da9aaa67e7f845ad48
+MISC ChangeLog 2345 RMD160 febcc50926a2920e0e07582f7fb6d447ad04f864 SHA1 86c5651cc4873d41c21e16e41c6af172c8e762c7 SHA256 4ab8080fc0e92a3d4bf75d4f2292245a1d92f32207123dc9748d6deb4962393c
 MISC metadata.xml 546 RMD160 047c855b9bf7a123aa9d005e7a78578fcd1201f6 SHA1 b619715c7a84415364db26824148076e6ccffec8 SHA256 09271ce5d626aa36c205cdda6ba157d7c5f9e0719d537e94b9ba3714bb11fd10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3svTsACgkQxeMuLWsGW/sWKACgl2bWNJ20U6u0fHv09rJmt1s7
-D6AAoKLPBJ7oLMwqc10iWfqzplfKCbAU
-=7J2+
+iEYEARECAAYFAk3svbEACgkQxeMuLWsGW/vSWQCfdFpcUrIkfzaMh+mWWncnveTo
+q0YAn0rLQkqiJkYB0FRuvZXp5MuYesEB
+=t/pi
 -----END PGP SIGNATURE-----
diff --git a/net-im/prosody/files/prosody-0.7.0-cfg.lua.patch b/net-im/prosody/files/prosody-0.7.0-cfg.lua.patch
deleted file mode 100644
index 68423f413f48..000000000000
--- a/net-im/prosody/files/prosody-0.7.0-cfg.lua.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- prosody.cfg.lua.old	2010-06-13 02:23:02.000000000 +0200
-+++ prosody.cfg.lua.dist	2010-06-18 10:45:40.165045845 +0200
-@@ -16,6 +16,10 @@
- -- Settings in this section apply to the whole server and are the default settings
- -- for any virtual hosts
- 
-+prosody_user = "jabber"
-+prosody_group = "jabber"
-+pidfile = "/var/run/jabber/prosody.pid"
-+
- -- This is a (by default, empty) list of accounts that are admins
- -- for the server. Note that you must create the accounts separately
- -- (see http://prosody.im/doc/creating_accounts for info)
-@@ -26,6 +30,14 @@
- -- For more information see: http://prosody.im/doc/libevent
- --use_libevent = true;
- 
-+-- Enable the Cyrus SASL backend for authentication against different backends,
-+-- such as PAM, LDAP, SQL  and more.
-+-- It also allows the use of GSSAPI for single-sign-on services. 
-+-- For more information see: http://prosody.im/doc/cyrus_sasl
-+--sasl_backend = "cyrus"
-+-- Optional, defaults to "xmpp"
-+--cyrus_service_name = "xmpp"
-+
- -- This is the list of modules Prosody will load on startup.
- -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
- -- Documentation on modules can be found at: http://prosody.im/doc/modules
-@@ -90,7 +102,9 @@
- 
- -- Logging configuration
- -- For advanced logging see http://prosody.im/doc/logging
--log = "prosody.log";
-+log = "/var/log/jabber/prosody.log"
-+-- Requires mod_posix to be loaded
-+-- log = "*syslog"
- debug = false; -- Log debug messages?
- 
- ----------- Virtual hosts -----------
diff --git a/net-im/prosody/prosody-0.7.0.ebuild b/net-im/prosody/prosody-0.7.0.ebuild
deleted file mode 100644
index 95b82be723b5..000000000000
--- a/net-im/prosody/prosody-0.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.7.0.ebuild,v 1.2 2011/03/22 20:59:44 ulm Exp $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-MY_PV=$(replace_version_separator 3 '')
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua."
-HOMEPAGE="http://prosody.im/"
-SRC_URI="http://prosody.im/downloads/source/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libevent ssl"
-
-DEPEND="net-im/jabber-base
-		>=dev-lang/lua-5.1
-		dev-lua/luasocket
-		ssl? ( dev-lua/luasec )
-		dev-lua/luaexpat
-		dev-lua/luafilesystem
-		libevent? ( dev-lua/luaevent )
-		>=net-dns/libidn-1.1
-		>=dev-libs/openssl-0.9.8"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-cfg.lua.patch"
-	useq libevent && sed -i "s!--use_libevent.*!use_libevent = true!" prosody.cfg.lua.dist
-	sed -i "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
-	sed -i "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
-	sed -i "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!" Makefile
-	sed -i "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!" Makefile
-}
-
-src_configure() {
-	./configure --prefix="/usr" \
-		--sysconfdir="${JABBER_ETC}" \
-		--datadir="${JABBER_SPOOL}" \
-		--with-lua-lib=/usr/$(get_libdir)/lua \
-		--c-compiler="$(tc-getCC)" --linker="$(tc-getLD)" \
-		--require-config || die "configure failed"
-}
-
-src_install() {
-	DESTDIR="${D}" emake install || die "make failed"
-	newinitd "${FILESDIR}/${PN}".initd ${PN}
-}
-
-src_test() {
-	cd tests
-	./run_tests.sh
-}
diff --git a/net-im/prosody/prosody-0.8.0.ebuild b/net-im/prosody/prosody-0.8.0.ebuild
deleted file mode 100644
index cc890988ed8d..000000000000
--- a/net-im/prosody/prosody-0.8.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.0.ebuild,v 1.1 2011/04/08 17:41:27 djc Exp $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-MY_PV=$(replace_version_separator 3 '')
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua."
-HOMEPAGE="http://prosody.im/"
-SRC_URI="http://prosody.im/downloads/source/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libevent ssl sql"
-
-DEPEND="net-im/jabber-base
-		>=dev-lang/lua-5.1
-		>=net-dns/libidn-1.1
-		>=dev-libs/openssl-0.9.8"
-RDEPEND="${DEPEND}
-		dev-lua/luasocket
-		ssl? ( dev-lua/luasec )
-		dev-lua/luaexpat
-		dev-lua/luafilesystem
-		sql? ( >=dev-lua/luadbi-0.5 )
-		libevent? ( dev-lua/luaevent )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-${PV}-cfg.lua.patch"
-	sed -i "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
-	sed -i "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
-	sed -i "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!" Makefile
-	sed -i "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!" Makefile
-}
-
-src_configure() {
-	# the configure script is handcrafted (and yells at unknown options)
-	# hence do not use 'econf'
-	./configure --prefix="/usr" \
-		--sysconfdir="${JABBER_ETC}" \
-		--datadir="${JABBER_SPOOL}" \
-		--with-lua-lib=/usr/$(get_libdir)/lua \
-		--c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \
-		--cflags="${CFLAGS} -Wall -fPIC" \
-		--ldflags="${LDFLAGS} -shared" \
-		--require-config || die "configure failed"
-}
-
-src_install() {
-	DESTDIR="${D}" emake install || die "make failed"
-	newinitd "${FILESDIR}/${PN}".initd ${PN}
-}
-
-src_test() {
-	cd tests
-	./run_tests.sh
-}
-
-pkg_postinst() {
-	elog "Please note that the module 'console' has been renamed to 'admin_telnet'."
-}