commit: b50a30689fca4c60d2b4e625f341daff116e51b6 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Mar 3 17:15:10 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat Mar 3 17:15:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50a3068
net-im/jabberd2: Removed from repository Bug: https://bugs.gentoo.org/623806 net-im/jabberd2/Manifest | 2 - net-im/jabberd2/files/jabberd2-2.3.1.pamd | 6 - net-im/jabberd2/files/jabberd2-2.3.2.init | 96 ----------- net-im/jabberd2/files/jabberd2-2.3.2.logrotate | 8 - net-im/jabberd2/files/jabberd2-2.5.0.init | 90 ---------- net-im/jabberd2/jabberd2-2.3.3-r2.ebuild | 159 ----------------- net-im/jabberd2/jabberd2-2.6.1.ebuild | 190 --------------------- net-im/jabberd2/metadata.xml | 15 -- profiles/arch/sparc/package.use.mask | 4 - profiles/package.mask | 6 - x11-misc/screen-message/screen-message-0.24.ebuild | 5 +- x11-misc/screen-message/screen-message-0.25.ebuild | 5 +- 12 files changed, 4 insertions(+), 582 deletions(-) diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest deleted file mode 100644 index 92f4bddfa69..00000000000 --- a/net-im/jabberd2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST jabberd-2.3.3.tar.xz 1457340 BLAKE2B f5d7da31037cff543db5b622334e829b2de803056437f29d28d3fc413424454bddbb75e0a20a1ef35bb5a4bfa41013e7b6865ccac46aab746a23f2f1ee842683 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da -DIST jabberd-2.6.1.tar.xz 1542156 BLAKE2B e6c66cc7490772a496face76ff0d57d950cf66798b326c1abf849a4a1cb2cec1cf1055d18bd97313cdc375e853568df17649026876de314ef319aee602b3b027 SHA512 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.pamd b/net-im/jabberd2/files/jabberd2-2.3.1.pamd deleted file mode 100644 index 2c5a5347ad6..00000000000 --- a/net-im/jabberd2/files/jabberd2-2.3.1.pamd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth required pam_nologin.so -auth include system-auth -account include system-auth -session include system-auth diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init deleted file mode 100644 index 4ef8aaea2c2..00000000000 --- a/net-im/jabberd2/files/jabberd2-2.3.2.init +++ /dev/null @@ -1,96 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="reload" - -depend() { - need net - use mysql postgresql slapd - provide jabber-server -} - -stopJabberServices() { - - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Stopping ${service}" - start-stop-daemon \ - --stop \ - --pidfile ${pidfile} - eend $? - fi - done - eoutdent - -} - -start_pre() { - checkpath -d -o jabber /var/run/jabber -} - -start() { - - einfo "Starting Jabber Server ..." - local services executable cfgfile pidfile - services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}') - eindent - for service in ${services}; do - - cfgfile=$(echo ${service} | cut -d ':' -f 2) - service=$(echo ${service} | cut -d ':' -f 1) - if [ ! -f "${cfgfile}" ]; then - if [ -f "/etc/jabber/${service}.xml" ]; then - cfgfile="/etc/jabber/${service}.xml" - else - eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml" - stopJabberServices - return 1 - fi - fi - - executable=/usr/bin/${service} - - if [ ! -f "${executable}" ]; then - eerror "Can't find executable: ${executable}" - stopJabberServices - return 1 - fi - - ebegin "Starting ${service} (${cfgfile})" - pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')" - start-stop-daemon \ - --background \ - --start \ - --user jabber:jabber \ - --exec /usr/bin/${service} \ - --pid ${pidfile} \ - -- -c ${cfgfile} - eend $? - - done - eoutdent - -} - -reload() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Reloading ${service}" - kill -HUP $(cat ${pidfile}) - eend $? - fi - done - eoutdent -} - -stop() { - - einfo "Stopping Jabber Server" - stopJabberServices - -} diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate deleted file mode 100644 index fcec0f7a1d5..00000000000 --- a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log { - su jabber jabber - sharedscripts - missingok - postrotate - /etc/init.d/jabberd reload - endscript -} diff --git a/net-im/jabberd2/files/jabberd2-2.5.0.init b/net-im/jabberd2/files/jabberd2-2.5.0.init deleted file mode 100644 index a5579f7b6c0..00000000000 --- a/net-im/jabberd2/files/jabberd2-2.5.0.init +++ /dev/null @@ -1,90 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="reload" - -depend() { - need net - use mysql postgresql slapd - provide jabber-server -} - -stopJabberServices() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Stopping ${service}" - start-stop-daemon \ - --stop \ - --pidfile ${pidfile} - eend $? - fi - done - eoutdent -} - -start_pre() { - checkpath -d -o jabber /var/run/jabber -} - -start() { - einfo "Starting Jabber Server ..." - local services executable cfgfile pidfile - services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}') - eindent - for service in ${services}; do - - cfgfile=$(echo ${service} | cut -d ':' -f 2) - service=$(echo ${service} | cut -d ':' -f 1) - if [ ! -f "${cfgfile}" ]; then - if [ -f "/etc/jabber/${service}.xml" ]; then - cfgfile="/etc/jabber/${service}.xml" - else - eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml" - stopJabberServices - return 1 - fi - fi - - executable="/usr/bin/$(echo ${service} | cut -d '.' -f 1)" - - if [ ! -f "${executable}" ]; then - eerror "Can't find executable: ${executable}" - stopJabberServices - return 1 - fi - - ebegin "Starting ${service} (${cfgfile})" - pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')" - start-stop-daemon \ - --background \ - --start \ - --user jabber:jabber \ - --exec ${executable} \ - --pid ${pidfile} \ - -- -c ${cfgfile} - eend $? - - done - eoutdent -} - -reload() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Reloading ${service}" - kill -HUP $(cat ${pidfile}) - eend $? - fi - done - eoutdent -} - -stop() { - einfo "Stopping Jabber Server" - stopJabberServices -} diff --git a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild deleted file mode 100644 index 5a604d5489e..00000000000 --- a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit db-use eutils flag-o-matic pam - -DESCRIPTION="Open Source Jabber Server" -HOMEPAGE="http://jabberd2.org"; -SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd" -IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test zlib" -REQUIRED_USE="memdebug? ( debug )" - -# broken -RESTRICT="test" - -DEPEND="dev-libs/expat - net-libs/udns - net-dns/libidn - virtual/gsasl - berkdb? ( >=sys-libs/db-4.1.25:* ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - pam? ( virtual/pam ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] ) - libressl? ( dev-libs/libressl ) - ) - sqlite? ( dev-db/sqlite:3 ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND} - >=net-im/jabber-base-0.01" -DEPEND="${DEPEND} - app-arch/xz-utils - virtual/pkgconfig - test? ( dev-libs/check )" - -DOCS=( AUTHORS README ) - -S=${WORKDIR}/jabberd-${PV} - -src_prepare() { - # Fix some default directory locations - sed -i \ - -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ - -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ - -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ - -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ - -e 's,@localstatedir@,/var/spool,g' \ - -e 's,@package@,jabber,g' \ - etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" - - # If the package wasn't merged with sqlite then default to use berkdb - use sqlite || - sed -i \ - -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ - etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" - - # avoid file collision with x11-misc/screen-message wrt #453994 - sed -i \ - -e 's/@jabberd_router_bin@/jabberd2-router/' \ - -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ - -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ - -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ - etc/jabberd*.in || die "fixing file collisions failed!" - - # rename pid files wrt #241472 - sed -i \ - -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \ - -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \ - -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \ - -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \ - etc/*.xml.dist.in || die "renaming pid files failed!" -} - -src_configure() { - # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 - # https://github.com/jabberd2/jabberd2/issues/34 - replace-flags -O[3s] -O2 - - # --enable-pool-debug is currently broken - econf \ - --sysconfdir=/etc/jabber \ - $(usex debug "--enable-debug" "") \ - $(usex memdebug "--enable-nad-debug" "") \ - $(use_enable ssl) \ - $(use_enable mysql) \ - $(use_enable postgres pgsql) \ - $(use_enable sqlite) \ - $(use_enable berkdb db) \ - $(use_enable ldap) \ - $(use_enable pam) \ - --enable-pipe \ - --enable-anon \ - --enable-fs \ - $(use_enable experimental) \ - $(use_enable test tests) \ - $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ - $(use_with zlib) -} - -src_install() { - local i - - default - prune_libtool_files --modules - - keepdir /var/spool/jabber/{fs,db} - fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ - /var/spool/jabber/{fs,db} - fperms 770 /var/spool/jabber/{fs,db} - fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} - - # avoid file collision with x11-misc/screen-message wrt #453994 - for i in router sm c2s s2s ; do - einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" - mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die - done - - newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd - newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd - - docompress -x /usr/share/doc/${PF}/tools - docinto tools - dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ - tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} - - # remove useless upstart files wrt #498900 - rm -rf "${ED%/}"/usr/etc -} - -pkg_postinst() { - if use pam; then - echo - ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' - ewarn 'be in the form of "contactname@jabberdomain". This behavior' - ewarn 'is likely to change in future versions of jabberd-2. It may' - ewarn 'be advisable to avoid PAM authentication for the time being.' - echo - fi - - if use sqlite || use mysql || use postgres; then - echo - einfo "You will need to setup or update your database using the" - einfo "scripts in /usr/share/doc/${PF}/tools/" - echo - fi - - ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' - ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' - ewarn 'the binaries have been renamed to avoid file collisions!' -} diff --git a/net-im/jabberd2/jabberd2-2.6.1.ebuild b/net-im/jabberd2/jabberd2-2.6.1.ebuild deleted file mode 100644 index cc3915cf4b4..00000000000 --- a/net-im/jabberd2/jabberd2-2.6.1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools db-use eutils flag-o-matic pam systemd - -DESCRIPTION="Open Source Jabber Server" -HOMEPAGE="http://jabberd2.org"; -SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib" -REQUIRED_USE="memdebug? ( debug )" - -DEPEND=" - dev-libs/expat - net-libs/udns - net-dns/libidn - virtual/gsasl - berkdb? ( >=sys-libs/db-4.1.25:= ) - ldap? ( net-nds/openldap ) - mysql? ( - virtual/libmysqlclient:= - virtual/mysql:= - ) - pam? ( virtual/pam ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] ) - libressl? ( dev-libs/libressl:= ) - ) - sqlite? ( dev-db/sqlite:3 ) - websocket? ( net-libs/http-parser:= ) - zlib? ( sys-libs/zlib ) -" -RDEPEND=" - ${DEPEND} - >=net-im/jabber-base-0.01 -" -DEPEND=" - ${DEPEND} - app-arch/xz-utils - sys-devel/autoconf-archive - virtual/pkgconfig - test? ( dev-libs/check ) -" - -DOCS=( AUTHORS README ) - -#PATCHES=( -#) - -S="${WORKDIR}/jabberd-${PV}" - -pkg_pretend() { - if is-flagq '-O[3s]' ; then - ewarn "O3/Os compiler flags have been known to cause problems" - ewarn "with old gcc version. Be aware that this could break" - ewarn "port binding. Make sure to test this." - ewarn "See https://github.com/jabberd2/jabberd2/issues/34"; - fi -} - -src_prepare() { - # Fix some default directory locations - sed -i \ - -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ - -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ - -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ - -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ - -e 's,@localstatedir@,/var/spool,g' \ - -e 's,@package@,jabber,g' \ - etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" - - # If the package wasn't merged with sqlite then default to use berkdb - use sqlite || - sed -i \ - -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ - etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" - - # avoid file collision with x11-misc/screen-message wrt #453994 - sed -i \ - -e 's/@jabberd_router_bin@/jabberd2-router/' \ - -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ - -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ - -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ - etc/jabberd*.in || die "fixing file collisions failed!" - - # rename pid files wrt #241472 - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-c2s\.pid/' \ - etc/c2s.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \ - etc/router.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \ - etc/s2s.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \ - etc/sm.xml.dist.in || die - - default - - eautoreconf -} - -src_configure() { - # --enable-pool-debug is currently broken - myeconfargs=( - --sysconfdir=/etc/jabber - --enable-pipe - --enable-anon - --enable-fs - $(usex debug "--enable-debug" "") - $(usex memdebug "--enable-nad-debug" "") - $(use_enable ssl) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable sqlite) - $(use_enable berkdb db) - $(use_enable ldap) - $(use_enable pam) - $(use_enable websocket) - $(use_enable experimental) - $(use_enable test tests) - $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") - $(use_with zlib) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local i - - # Fix systemd unit files installation path, bug #626026 - emake systemddir="$(systemd_get_systemunitdir)" DESTDIR="${D}" install - einstalldocs - prune_libtool_files --modules - - keepdir /var/spool/jabber/{fs,db} - fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ - /var/spool/jabber/{fs,db} - fperms 770 /var/spool/jabber/{fs,db} - fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} - - # avoid file collision with x11-misc/screen-message wrt #453994 - for i in router sm c2s s2s ; do - einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" - mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die - done - - newinitd "${FILESDIR}/${PN}-2.5.0.init" jabberd - newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd - - docompress -x /usr/share/doc/${PF}/tools - docinto tools - dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ - tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} - - # remove useless upstart files wrt #498900 - rm -rf "${ED%/}"/usr/etc -} - -pkg_postinst() { - if use pam; then - echo - ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' - ewarn 'be in the form of "contactname@jabberdomain". This behavior' - ewarn 'is likely to change in future versions of jabberd-2. It may' - ewarn 'be advisable to avoid PAM authentication for the time being.' - echo - fi - - if use sqlite || use mysql || use postgres; then - echo - einfo "You will need to setup or update your database using the" - einfo "scripts in /usr/share/doc/${PF}/tools/" - echo - fi - - ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' - ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' - ewarn 'the binaries have been renamed to avoid file collisions!' -} diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml deleted file mode 100644 index ab20f28a6a3..00000000000 --- a/net-im/jabberd2/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="experimental">Enable experimental features such - as TLS Everywhere.</flag> - <flag name="memdebug">Enable nad and pool debug. - Requires USE="debug" to be set.</flag> - <flag name="websocket">Enable WebSocket support on C2S port.</flag> - </use> - <upstream> - <remote-id type="github">jabberd2/jabberd2</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 7169e6e5418..45642ec2656 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -143,10 +143,6 @@ dev-python/pyquery test # Missing keywords >=media-plugins/grilo-plugins-0.2.14 upnp-av -# Julian Ospald <[email protected]> (08 Nov 2015) -# Requires net-libs/http-parser -net-im/jabberd2 websocket - # Davide Pesavento <[email protected]> (26 Oct 2015) # Tests require non-keyworded qt5 dev-qt/qtchooser test diff --git a/profiles/package.mask b/profiles/package.mask index 4dbe1fd67fd..316b884c121 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -318,12 +318,6 @@ app-misc/misterhouse # Removal in a month. app-forensics/autopsy -# Pacho Ramos <[email protected]> (04 Jan 2018) -# Multiple security issues, init scripts need a major rework (#629416, -# #629412, #631068, #623806). Removal in a month. -net-im/jabberd2 -net-im/mu-conference - # Pacho Ramos <[email protected]> (04 Jan 2018) # Not compatible with current libmowgli, no reverse deps (#630030). Removal # in a month. diff --git a/x11-misc/screen-message/screen-message-0.24.ebuild b/x11-misc/screen-message/screen-message-0.24.ebuild index bd4cac87586..660c376e0ee 100644 --- a/x11-misc/screen-message/screen-message-0.24.ebuild +++ b/x11-misc/screen-message/screen-message-0.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -15,8 +15,7 @@ IUSE="" DEPEND="x11-libs/gtk+:3 x11-libs/cairo >=x11-libs/pango-1.16" -RDEPEND="${DEPEND} - !<net-im/jabberd2-2.2.17-r1" +RDEPEND="${DEPEND}" src_install() { default diff --git a/x11-misc/screen-message/screen-message-0.25.ebuild b/x11-misc/screen-message/screen-message-0.25.ebuild index a98b675cc3a..f3df7c0075d 100644 --- a/x11-misc/screen-message/screen-message-0.25.ebuild +++ b/x11-misc/screen-message/screen-message-0.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -15,8 +15,7 @@ IUSE="" DEPEND="x11-libs/gtk+:3 x11-libs/cairo >=x11-libs/pango-1.16" -RDEPEND="${DEPEND} - !<net-im/jabberd2-2.2.17-r1" +RDEPEND="${DEPEND}" src_install() { default
