Remove old.

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

9 files changed, 14 insertions, 544 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index d0649065c9f4..92836af67361 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ejabberd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.125 2014/08/05 18:34:12 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.126 2015/03/09 20:53:27 mrueg Exp $
+
+  09 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -ejabberd-2.1.12.ebuild,
+  -ejabberd-2.1.13.ebuild:
+  Remove old.
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> ejabberd-2.1.12.ebuild,
   ejabberd-2.1.13-r1.ebuild, ejabberd-2.1.13.ebuild:
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 1739db78ec9e..1e403a8f9c9d 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -3,11 +3,8 @@ AUX ejabberd-3.initd 1025 SHA256 2810ca25fbe9d41a175b15c82d9ea1254fc4c934fd6ec02
 AUX ejabberd.logrotate 203 SHA256 42f28222c6a5b7c691eb371085cccdef3fcba059a1e89f18744aa9bfc25e6294 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2 WHIRLPOOL ffbdfc1b22e855666aedbf816ec44439addcae21d82509399de046fa6a7c0182c1df756377a9d08d3b1f1d73e1e09ecd85da145357850d8a11d8ddb4b3b29d2a
 AUX ejabberd.service 422 SHA256 a699466dd95b8fb98aca078ca7e57a2d9f0fed13ecdc70d10b96e96df61b64af SHA512 91ba2ca5b0104a7628a63a80efd0ec4aa016f9100b631701e18ab7b524c2e2e9471a6ece4adcc90bbea16af05479dfa5a2414d2f50bdd4b0cd06a1e40539c5e3 WHIRLPOOL eb3b5af56eaf4292cdb67854e46ccc9d0c4f3f8674ad7992fdbfb037c3a441b27c922ac80f2fd8819c84411f045c689e67eeca4e331d088c7749fa4fc74437a3
 AUX ejabberd.tmpfiles.conf 43 SHA256 2ee7fb4fb9c9c931ffa8c1dfa273e6658f3bbd37bb6ae25765b9e4f2a7459506 SHA512 8bdc297d5cb405e82c33627b36730992584d7f8b92d15c47933edd01ba6575983009c1f6607a21eee0280abdf7b51639d99d7836712a8d3629ec1e960b8a02c4 WHIRLPOOL f27e3a9bff1ab941c4a80fc5573d8541e40804f24b2f2e40e0f77c2ea2016e5c0b323e59674ed880df95037d0d82a956bc9ea984b5b371dd16e50858faa7e0d0
-DIST ejabberd-2.1.12.tgz 1999224 SHA256 38f0825346773c00c85a66b33586c75f2d191d1eb0ed8ae09fa17368d6ddfd19 SHA512 725ab9563a6c73e85b5115f66bac157cf9b1170913c1bfed7cf066408c6b3ac5b4bdba22c6c3ed1505391a7048a86ce3b59484f78264ab023612c539422278db WHIRLPOOL 3de3b103f69b8ead3d68cb70f3073808c40cd9541f0fd97aff7173f3ecabf6755295e1c30de83e67c844dc6886a5c2cb55a26980f4275cb32008e922591ae35a
 DIST ejabberd-2.1.13.tgz 1999853 SHA256 a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512 9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b WHIRLPOOL 2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
 DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256 5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512 99399323150990cda15e707385f0f26fa790d4ba188a97ac46daaaab9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d WHIRLPOOL 05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702
-EBUILD ejabberd-2.1.12.ebuild 7969 SHA256 5ea3241aee38ba4644283487fafd5ee77f88c37d84df22d63164ff117ef691a9 SHA512 e60af1977ff978f92e11f6ff34851d158429ba5f7ff19f2d95476750e5ac811aff097d19b3a3cc81b4a3fdb2b11a19865643465c1414a568ce4efc63456f41db WHIRLPOOL 812f9c5fa537f9252d76321fab470e2e9e0d2cf5bbb6df286542a4fc0eede3394e17f30c9c3b75dc22835ab7b27d66e6b6ad973ad83055b34aa7bdd7f50b06bc
 EBUILD ejabberd-2.1.13-r1.ebuild 8274 SHA256 e16a5597895475bd4f189bf507708c63c98774ea93ee4650f5982811db4812c0 SHA512 cae7f9f6b015c97505c713d31732619d1f222a0ce2e35effa36e5f5105f3bed2c080f9180dbc7533b02f403e08ab2dbd5fea99e8e88127ee54b59e30ddcd55f2 WHIRLPOOL 933d1f5f19a8f63faa524dea110ad5658602ae62194169393756c651080240b8373fcc88f1714fda18ac81adddeb90cf1c9330a08c78f41391a04f2e5157036d
-EBUILD ejabberd-2.1.13.ebuild 8102 SHA256 1571a38bcfb4ada92554f4e236cc2d6704bd59f01018b7df44bba2795506af0b SHA512 4f2ff63cb1f8033f4901b50c4da27e2113f3cf27dfe2d2f4adf02f6957261fd9aeef6e6e1b75ab707894f2038705389fbd7ba1a9528265b9d0f0fa1745fbdf01 WHIRLPOOL 2075767f53483c7ea0cf5b62bfe18f5c0cce2f73d8194cc94f2bfd5ad65397155804350e1e4b9071e3a4ea0012f2bff5dab3017c50988220be524986dc19fc0b
-MISC ChangeLog 23879 SHA256 715c8be4b1f1e24fef805c9d0a2431db98c6843bc018318a7c18a0fd8ee9fd4f SHA512 938fb826c53558dc6ee0a539bbc1f93b6aef96202e355dcbdb96821e017b21d1b5a4e99fcbdeff9700c47c70643f90e65cf4286995106b3585a5fee29f2a2716 WHIRLPOOL 34eab93f3af5461b9df5aedb6381f60626e5c33e26bbc866d0a836aaa1d3d5b1ed9199dd6366159d38ccab7d6343b98349395762c153749b1ddd94436c76edf3
+MISC ChangeLog 23994 SHA256 f4cf11da3d55c5878c50c01989aa5abacb41efa9ad7c3823013f2fe9471b74ce SHA512 6b5b1005969cfd383aad90cf406876993d1c5b1dd31fe212785e00a629363d3236c606c8ba8aa388a3fed22f7d056044b56c78dbf93431384af71da4b461c462 WHIRLPOOL 3b98123a1fc2a7e63435f6e5b9d4fc86e6b4d33057e3ad59d0a6049433eda1f827d135fe2ab83fb10eaf6f5696e4c4fedf1051c619c8a0c8b4cf74afd904f3e4
 MISC metadata.xml 915 SHA256 9c1956a6be7e957bf41c3ac9b5b176a9edd963fc5c8055609461689e09e0cbc6 SHA512 7ce2467693ba5db6397e28fe71a5add944c005aadfe83d21ced82a830c26971a4e94b1273239e1c0a729f2bf8b2e46a603a65109b93d7f2695e764dddbb114b8 WHIRLPOOL 19ef3e6c81ccfe6aa11b8e796956a19cdc80e56645dea70b28e1a67db211b88f36893e196f243a839d40613c6ff8b421c73f0d72ffea925fe13dbdf484b59804
diff --git a/net-im/ejabberd/ejabberd-2.1.12.ebuild b/net-im/ejabberd/ejabberd-2.1.12.ebuild
deleted file mode 100644
index 0fd0918e16f2..000000000000
--- a/net-im/ejabberd/ejabberd-2.1.12.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.12.ebuild,v 1.5 2014/08/05 18:34:12 mrueg Exp $
-
-EAPI=5
-
-inherit eutils multilib pam ssl-cert
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-	mod_statsdx? ( http://dev.gentoo.org/~radhermit/dist/${PN}-mod_statsdx-1118.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
-IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
-
-DEPEND=">=net-im/jabber-base-0.01
-	>=dev-libs/expat-1.95
-	>=dev-lang/erlang-12.2.5[ssl]
-	odbc? ( dev-db/unixODBC )
-	ldap? ( =net-nds/openldap-2* )
-	>=dev-libs/openssl-0.9.8e
-	captcha? ( media-gfx/imagemagick[truetype,png] )
-	zlib? ( sys-libs/zlib )"
-#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
-RDEPEND="${DEPEND}
-	>=sys-apps/shadow-4.1.4.2-r3
-	pam? ( virtual/pam )"
-
-S=${WORKDIR}/${P}/src
-
-# paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-#JABBER_RUN="/var/run/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
-
-src_prepare() {
-	if use mod_statsdx; then
-		ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
-		ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/${PN}-mod_statsdx-1118.patch
-	fi
-
-	# don't install release notes (we'll do this manually)
-	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
-	# Set correct paths
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
-		-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
-		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
-		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
-			-i Makefile.in || die
-	sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
-		-e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \
-		-e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \
-		-e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \
-			-i ejabberdctl.template || die
-
-	# Set shell, so it'll work even in case jabber user have no shell
-	# This is gentoo specific I guess since other distributions may have
-	# ejabberd user with reall shell, while we share this user among different
-	# jabberd implementations.
-	sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die
-	sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die
-
-	#sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl
-
-	# fix up the ssl cert paths in ejabberd.cfg to use our cert
-	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
-		-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# correct path to captcha script in default ejabberd.cfg
-	sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
-			-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# disable mod_irc in ejabberd.cfg
-	if ! use mod_irc; then
-		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
-			-i ejabberd.cfg.example || die "Failed to disable mod_irc"
-	fi
-
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
-		$(use_enable mod_irc) \
-		$(use_enable ldap eldap) \
-		$(use_enable mod_muc) \
-		$(use_enable mod_proxy65) \
-		$(use_enable mod_pubsub) \
-		$(use_enable web) \
-		$(use_enable odbc) \
-		$(use_enable zlib ejabberd_zlib) \
-		$(use_enable pam) \
-		--enable-user=jabber
-}
-
-src_compile() {
-	emake $(use debug && echo debug=true ejabberd_debug=true)
-}
-
-src_install() {
-	default
-
-	# Pam helper module permissions
-	# http://www.process-one.net/docs/ejabberd/guide_en.html
-	if use pam; then
-		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
-		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
-		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
-	fi
-
-	cd "${WORKDIR}/${P}/doc"
-	dodoc "release_notes_${PV%%_rc*}.txt"
-
-	#dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}-3.confd" ${PN}
-}
-
-pkg_postinst() {
-	elog "For configuration instructions, please see"
-	elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
-	elog "http://www.process-one.net/en/ejabberd/docs/guide_en/"
-
-	if ! use web ; then
-		ewarn
-		ewarn "The web USE flag is off, this has disabled the web admin interface."
-		ewarn
-	fi
-
-	elog
-	elog '===================================================================='
-	elog 'Quick Start Guide:'
-	elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91'
-	elog '   {hosts, ["localhost", "thehost"]}.'
-	elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360'
-	elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
-	elog '3) Start the server'
-	elog '   # /etc/init.d/ejabberd start'
-	elog '4) Register the admin user'
-	elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
-	elog '5) Log in with your favourite jabber client or using the web admin'
-
-	# Upgrading from ejabberd-2.0.x:
-	if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then
-		source "${EROOT}/etc/conf.d/ejabberd"
-		ewarn
-		ewarn "!!! WARNING !!!  WARNING !!!  WARNING !!!  WARNING !!!"
-		ewarn "Starting with 2.1.x some paths and configuration files were"
-		ewarn "changed to reflect upstream intentions better. Notable changes are:"
-		ewarn
-		ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
-		ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
-		ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
-		ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."
-		ewarn
-		ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides"
-		ewarn "at standard location: /etc/ssl/ejabberd/server.pem."
-		ewarn
-		ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie"
-		ewarn
-		ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log"
-		ewarn
-		ewarn "5. Crash dumps (if any) will be located at /var/log/jabber"
-
-		local i ctlcfg new_ctlcfg
-		i=0
-		ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg
-		while :; do
-			new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i})
-			[[ ! -e ${new_ctlcfg} ]] && break
-			ctlcfg=${new_ctlcfg}
-			((i++))
-		done
-
-		ewarn
-		ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
-		sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
-
-		if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
-			ewarn "Moving .erlang.cookie..."
-			if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then
-				mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak}
-			fi
-			mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie
-		fi
-		ewarn
-		ewarn "We'll try to handle upgrade automagically but, please, do your"
-		ewarn "own checks and do not forget to run 'etc-update'!"
-		ewarn "PLEASE! Run 'etc-update' now!"
-	fi
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
-	install_cert /etc/ssl/ejabberd/server
-	# Fix ssl cert permissions bug #369809
-	chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
-	chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
-	if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
-		ewarn
-		ewarn "The location of SSL certificates has changed. If you are"
-		ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
-		ewarn "want to move your old certificates from /etc/jabber into"
-		ewarn "/etc/ssl/ejabberd/, update config files and"
-		ewarn "rm /etc/jabber/ssl.pem to avoid this message."
-		ewarn
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-2.1.13.ebuild b/net-im/ejabberd/ejabberd-2.1.13.ebuild
deleted file mode 100644
index 9d8a25198365..000000000000
--- a/net-im/ejabberd/ejabberd-2.1.13.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.13.ebuild,v 1.2 2014/08/05 18:34:12 mrueg Exp $
-
-EAPI=5
-
-inherit eutils multilib pam ssl-cert
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-	mod_statsdx? ( http://dev.gentoo.org/~radhermit/dist/${PN}-mod_statsdx-1118.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
-IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
-
-DEPEND=">=net-im/jabber-base-0.01
-	>=dev-libs/expat-1.95
-	>=dev-lang/erlang-12.2.5[ssl]
-	<dev-lang/erlang-16
-	odbc? ( dev-db/unixODBC )
-	ldap? ( =net-nds/openldap-2* )
-	>=dev-libs/openssl-0.9.8e
-	captcha? ( media-gfx/imagemagick[truetype,png] )
-	zlib? ( sys-libs/zlib )"
-#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
-RDEPEND="${DEPEND}
-	>=sys-apps/shadow-4.1.4.2-r3
-	pam? ( virtual/pam )"
-
-S=${WORKDIR}/${P}/src
-
-# paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-#JABBER_RUN="/var/run/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
-
-src_prepare() {
-	if use mod_statsdx; then
-		ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
-		ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/${PN}-mod_statsdx-1118.patch
-	fi
-
-	# don't install release notes (we'll do this manually)
-	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
-	# Set correct paths
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
-		-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
-		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
-		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
-			-i Makefile.in || die
-	sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
-		-e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \
-		-e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \
-		-e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \
-			-i ejabberdctl.template || die
-
-	# Set shell, so it'll work even in case jabber user have no shell
-	# This is gentoo specific I guess since other distributions may have
-	# ejabberd user with reall shell, while we share this user among different
-	# jabberd implementations.
-	sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die
-	sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die
-
-	#sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl
-
-	# fix up the ssl cert paths in ejabberd.cfg to use our cert
-	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
-		-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# correct path to captcha script in default ejabberd.cfg
-	sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
-			-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# disable mod_irc in ejabberd.cfg
-	if ! use mod_irc; then
-		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
-			-i ejabberd.cfg.example || die "Failed to disable mod_irc"
-	fi
-
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
-		$(use_enable mod_irc) \
-		$(use_enable ldap eldap) \
-		$(use_enable mod_muc) \
-		$(use_enable mod_proxy65) \
-		$(use_enable mod_pubsub) \
-		$(use_enable web) \
-		$(use_enable odbc) \
-		$(use_enable zlib ejabberd_zlib) \
-		$(use_enable pam) \
-		--enable-user=jabber
-}
-
-src_compile() {
-	emake $(use debug && echo debug=true ejabberd_debug=true)
-}
-
-src_install() {
-	default
-
-	# Pam helper module permissions
-	# http://www.process-one.net/docs/ejabberd/guide_en.html
-	if use pam; then
-		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
-		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
-		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
-	fi
-
-	cd "${WORKDIR}"/${P}/doc
-	dodoc release_notes_${PV%%_rc*}.txt
-
-	newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "For configuration instructions, please see"
-		elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
-		elog "http://www.process-one.net/en/ejabberd/docs/guide_en/"
-
-		if ! use web ; then
-			ewarn
-			ewarn "The web USE flag is off, this has disabled the web admin interface."
-			ewarn
-		fi
-
-		elog
-		elog '===================================================================='
-		elog 'Quick Start Guide:'
-		elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91'
-		elog '   {hosts, ["localhost", "thehost"]}.'
-		elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360'
-		elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
-		elog '3) Start the server'
-		elog '   # /etc/init.d/ejabberd start'
-		elog '4) Register the admin user'
-		elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
-		elog '5) Log in with your favourite jabber client or using the web admin'
-	fi
-
-	# Upgrading from ejabberd-2.0.x:
-	if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then
-		source "${EROOT}/etc/conf.d/ejabberd"
-		ewarn
-		ewarn "!!! WARNING !!!  WARNING !!!  WARNING !!!  WARNING !!!"
-		ewarn "Starting with 2.1.x some paths and configuration files were"
-		ewarn "changed to reflect upstream intentions better. Notable changes are:"
-		ewarn
-		ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
-		ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
-		ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
-		ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."
-		ewarn
-		ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides"
-		ewarn "at standard location: /etc/ssl/ejabberd/server.pem."
-		ewarn
-		ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie"
-		ewarn
-		ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log"
-		ewarn
-		ewarn "5. Crash dumps (if any) will be located at /var/log/jabber"
-
-		local i ctlcfg new_ctlcfg
-		i=0
-		ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg
-		while :; do
-			new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i})
-			[[ ! -e ${new_ctlcfg} ]] && break
-			ctlcfg=${new_ctlcfg}
-			((i++))
-		done
-
-		ewarn
-		ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
-		sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
-
-		if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
-			ewarn "Moving .erlang.cookie..."
-			if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then
-				mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak}
-			fi
-			mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie
-		fi
-		ewarn
-		ewarn "We'll try to handle upgrade automagically but, please, do your"
-		ewarn "own checks and do not forget to run 'etc-update'!"
-		ewarn "PLEASE! Run 'etc-update' now!"
-	fi
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
-	install_cert /etc/ssl/ejabberd/server
-	# Fix ssl cert permissions bug #369809
-	chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
-	chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
-	if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
-		ewarn
-		ewarn "The location of SSL certificates has changed. If you are"
-		ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
-		ewarn "want to move your old certificates from /etc/jabber into"
-		ewarn "/etc/ssl/ejabberd/, update config files and"
-		ewarn "rm /etc/jabber/ssl.pem to avoid this message."
-		ewarn
-	fi
-}
diff --git a/net-im/silc-server/ChangeLog b/net-im/silc-server/ChangeLog
index 7988cd5ecacf..346f167f87ba 100644
--- a/net-im/silc-server/ChangeLog
+++ b/net-im/silc-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/silc-server
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.45 2014/08/05 18:34:18 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.46 2015/03/09 20:55:41 mrueg Exp $
+
+  09 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -files/1.1-execstack.patch,
+  -files/silcd.initd, -silc-server-1.1.14.ebuild:
+  Remove old.
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> silc-server-1.1.14.ebuild,
   silc-server-1.1.18.ebuild:
diff --git a/net-im/silc-server/Manifest b/net-im/silc-server/Manifest
index d45194a124c9..8a37801477fb 100644
--- a/net-im/silc-server/Manifest
+++ b/net-im/silc-server/Manifest
@@ -1,9 +1,5 @@
-AUX 1.1-execstack.patch 273 SHA256 6c9ba9b670409a7691b504f6373def4c77d906588065335e71e2d8cd6faafc5a SHA512 a32d03ab7f13a3eaa7837e7ad4cb5f504a10c47ce656541023ac21a02a83b839cf4199e90ece497620b6c03f421343641c9aa8af699a3b96431e9850828f2921 WHIRLPOOL e680ef0523472daf871b03459d2b7afb0c66c5dd016acf5492c9ea0e1baeb6af50ee20bb0be66eadb346cb7413b3152f9b5bc593efa3500b1e12784032d84a15
-AUX silcd.initd 523 SHA256 acbec107b284321464d57c80cbf9f92e8dc9bb90b81593db815280700977c4f7 SHA512 b24c7a33b5e3b24647a0b7076c38ed8ef428cd1dea77701c07b16a4d9ece4d0a9f7fdba9f9c9a4f905ace09d90cb435f25cb7a08319c17bc71709c4ca0079740 WHIRLPOOL f98e95b56970e575ff717e885064c7bb6ee93113597152bedc1eb784a1d5decf9cd5ccafaf85c5fa1c0e1b22f8289d099689f65614650cf42062fccc38b027f4
 AUX silcd.initd-r1 738 SHA256 dacb34edd44c66bddba39d565c836b735dfc787e9ee6a12287fd23b179950f40 SHA512 0808daf3eed023ee20c7ef2c8b71fe18a0548720a98589b4299a423c7b56fe1d39f0a23111e0c1e6ea8c7fb969e5bc9f5aa348aa0a1491d6deeab1b5efd87314 WHIRLPOOL 3474d201607e2964ef754e1a57fe4ca3b5e80d88152f3ee412154e812ffefb7d3ade02ee5b1fe7da95d7583105e9505029415f4a7fd9b9c63f760de7f7d7c08c
-DIST silc-server-1.1.14.tar.bz2 924903 SHA256 f06fc8d61790c082556852293c46eaba5af3afdb51d067b448592b9dc5489cd9
 DIST silc-server-1.1.18.tar.bz2 908188 SHA256 1a0d4efb5683b3148b3ba91d5b56fff60875bc8bb97e854330714d927986205b SHA512 bf457a5f75037c56138154cfdba62d7ec27a91bc3606c84760a2103c90dff1ea9beb09c6e86e25074142610c6e14d7dffc24956debfa8355b37a4a1fb5e68e47 WHIRLPOOL 297b5a8b673597ea41b45bf46efd746ce49dd7bb514965529b1a8f97bf7765bb668b9ee16383579325fa81eb7e8ddf954e6333c4ff3d2c103f4dbf4ea3677a9b
-EBUILD silc-server-1.1.14.ebuild 1695 SHA256 66982b6163db89c8926750620b121d1d02a8a0b2167cad7e58b4f2f0040de25a SHA512 843763cf0f7c51def9b2bdeb0152f9e3833a7157a847a3e4e9b7b9f2ade4323fc9f9ba3889cc93b816bc31f256bb2809b912b11cc717dc4b3c3efd314c72dd1f WHIRLPOOL 81302da0d5b85f8fc7024b3591d11d701f9e8c1ad46b763c747f5affb13a9dc417011178eaabba3c376faeaa963f8d009c64730178ae8aaeaa671b948fb13db3
 EBUILD silc-server-1.1.18.ebuild 1862 SHA256 1e273d41af23046f278531b78e85a5cb8be4a0aa70713d8a3fab3a10bbefa01a SHA512 cfcef2640e3fc7a648fb282c210db5a388826e72514dd330f93c82b11429306fcfa8d44793dde432ccd41a2e272159e0cf0249e80f45e569d78e3b1905f5658f WHIRLPOOL 85864279a4e6c4c8aedb1fe6eb7bc5c115f72866b48ab62207e9d2384ed14fbe1cf1d58e9e6a7269f3882a66e035cf28168abd642aab6a2189add8bc58470d4f
-MISC ChangeLog 6666 SHA256 c8d08991f280fc6a23c290cb9c3060541eb9f72b1c2787c803a76b367b66709b SHA512 fb431af47503a3eba46d766ae8059cdb0e9d31726547c4004d4eddbba116a971fafaa2abd03c0c10d98d2c3b0b581d8f348046288a7a59940d8bf2a593592a30 WHIRLPOOL 45ec33df83ee9c8c06bb0ff20376f91a881f005888574cf6ae08a0a26c1ba342f029506228ed7ad223c0c58c84ccc4d2a9683ef15550567208f719771e02e89f
+MISC ChangeLog 6807 SHA256 ff9b6a3b2b2b3072c67b4e99981206cc4994dd6725860aa88d05165a7e7d85eb SHA512 4c4f28e9faec615cd3723e48f1b49f1d760890368fada4850b0fd3a0067d138e67474526144952b9fc69aab24d07ab83ff716ba92dc2324966a1265387d9b29b WHIRLPOOL 8d47cbe59a8dbb94bfcfc0435b77cc9578a7acac2f82a15f0e8b4f65d2a123eb79a0ce9b95cf9d90dfee0b70a1c5d455bac308296e59fe0e2a421511b04bd16b
 MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
diff --git a/net-im/silc-server/files/1.1-execstack.patch b/net-im/silc-server/files/1.1-execstack.patch
deleted file mode 100644
index a7b2d41946a2..000000000000
--- a/net-im/silc-server/files/1.1-execstack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/silccrypt/aes_x86.asm.orig	2007-12-05 19:43:16.000000000 +0100
-+++ lib/silccrypt/aes_x86.asm	2007-12-05 19:43:31.000000000 +0100
-@@ -595,3 +595,7 @@
- %endif
- 
-     end
-+
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
diff --git a/net-im/silc-server/files/silcd.initd b/net-im/silc-server/files/silcd.initd
deleted file mode 100644
index 0173ecdbba3e..000000000000
--- a/net-im/silc-server/files/silcd.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/files/silcd.initd,v 1.2 2009/02/24 17:33:34 drizzt Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting silcd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/silcd -- -f /etc/silc/silcd.conf >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Shutting down silcd"
-	start-stop-daemon --stop --pidfile /var/run/silcd.pid
-	eend $?
-}
diff --git a/net-im/silc-server/silc-server-1.1.14.ebuild b/net-im/silc-server/silc-server-1.1.14.ebuild
deleted file mode 100644
index 1582b4d97c76..000000000000
--- a/net-im/silc-server/silc-server-1.1.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.14.ebuild,v 1.3 2014/01/08 06:41:24 vapier Exp $
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Server for Secure Internet Live Conferencing"
-SRC_URI="http://www.silcnet.org/download/server/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ipv6 debug"
-
-RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1
-	!<=net-im/silc-client-1.0.1"
-
-src_compile() {
-	econf \
-		--datadir=/usr/share/${PN} \
-		--datarootdir=/usr/share/${PN} \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/${PN}/help \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimizations \
-		--with-logsdir=/var/log/${PN} \
-		--with-silcd-pid-file=/var/run/silcd.pid \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/examples/*.conf
-
-	fperms 600 /etc/silc
-	keepdir /var/log/${PN}
-
-	rm -rf \
-		"${D}"/usr/libsilc* \
-		"${D}"/usr/include \
-		"${D}"/etc/silc/silcd.{pub,prv}
-
-	newinitd "${FILESDIR}/silcd.initd" silcd
-
-	sed -i \
-		-e 's:10.2.1.6:0.0.0.0:' \
-		-e 's:User = "nobody";:User = "silcd";:' \
-		"${D}"/etc/silc/silcd.conf
-}
-
-pkg_postinst() {
-	enewuser silcd
-
-	if [ ! -f "${ROOT}"/etc/silc/silcd.prv ] ; then
-		einfo "Creating key pair in /etc/silc"
-		silcd -C "${ROOT}"/etc/silc
-		chmod 600 "${ROOT}"/etc/silc/silcd.{prv,pub}
-	fi
-}