summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2011-06-06 11:44:26 +0000
committerDirkjan Ochtman <djc@gentoo.org>2011-06-06 11:44:26 +0000
commit2077a2ec87dc5247ecafdc66e45dbdd20807620c (patch)
tree493b7862f7e14aacfcee073e6cf929ff7ce54434
parentremove old (diff)
downloadgentoo-2-2077a2ec87dc5247ecafdc66e45dbdd20807620c.tar.gz
gentoo-2-2077a2ec87dc5247ecafdc66e45dbdd20807620c.tar.bz2
gentoo-2-2077a2ec87dc5247ecafdc66e45dbdd20807620c.zip
Remove old versions.
(Portage version: 2.1.9.50/cvs/Linux x86_64)
-rw-r--r--net-im/prosody/ChangeLog6
-rw-r--r--net-im/prosody/files/prosody-0.7.0-cfg.lua.patch39
-rw-r--r--net-im/prosody/prosody-0.7.0.ebuild61
-rw-r--r--net-im/prosody/prosody-0.8.0.ebuild69
4 files changed, 5 insertions, 170 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/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'."
-}