gentoo resync : 13.10.2019

3 files changed, 3 insertions, 55 deletions

diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index 607501b576ad..ccc96fd0f348 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,3 +1,2 @@
-EBUILD jabber-base-0.01-r1.ebuild 1525 BLAKE2B ee403af798d7b57f66847083d387d1fa874acf95c54643d56734b3d8ab7a78997bc62d3b793d852e53b72ddef8788cf9f3fa205d757c497db236b48fa72b8d9b SHA512 6651e099d29a9aad2a9baccd81a402036a0d946672ded1c606626e718188c4314649804c6e0596b0cbb1b552f07497a7ac5bb8fb28d61ab5003dd20dd4e695f8
-EBUILD jabber-base-0.01.ebuild 1518 BLAKE2B 4b38cd4ed480372ec0189b1157799b833d686ad49bd5a82a749b4823510cfab5340c1b56dadeaa6095358a33548afb2a844073035937363ddd1eb4b2a89c4c50 SHA512 3116d58289fb78e6d191a42e05153e490f1e704456bba7e41e33fd9f0fc9c0598bdcb51bb025d947bd5f23141ed663dfbf135b516a7d972958823597d44c87d4
+EBUILD jabber-base-0.01-r1.ebuild 1506 BLAKE2B 1c94506530ae4b7d8cd4c0b3a98c74c6c44504e1f5053472f742ac3561884dd91dddd8d8ab32660dc07023737b10b5de031c0a15df906a7cb5593b214ed176d3 SHA512 2678a39e9252662c4da114f931f74a881d54df36a310cad3724b53e61938151452067b247d7ede65f42a78409657f728930910e012299e9d6efaed74d25d2404
 MISC metadata.xml 363 BLAKE2B d39b7cb71af89d54bcd663508abec175512058c81d0ecc11cbcf76455e40dbf36c5641bf943266e8f7ce0a7f6bb5807f0fbfe78a2d04054178bf99c15dc1060a SHA512 44bd244e6521f2132804357972d71f92e704471a42828f41b334966d02509c948674aaf20f7c61ff33c2432467cd6b021c30a27bcd851fdedcc7f353903f8462
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
index 919283672cab..dd01753c31d9 100644
--- a/net-im/jabber-base/jabber-base-0.01-r1.ebuild
+++ b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-im/jabber-base/jabber-base-0.01.ebuild b/net-im/jabber-base/jabber-base-0.01.ebuild
deleted file mode 100644
index a0cbb48beb39..000000000000
--- a/net-im/jabber-base/jabber-base-0.01.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="Jabber servers and transports layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}"
-
-#Info for people working in jabber related packages
-
-#/etc/jabber/ for configuration files
-#/var/run/jabber/ for the pid files
-#/var/spool/jabber/ for the flat files databases (actually there must be a ewarn
-#at end of ebuild telling user to creat /var/spool/jabber/JID, as some transports fail to start if
-#the directory is not there, even if they have permissions to creat it)
-#/var/log/jabber/ for the log files
-
-#for the python based transports with no install script:
-#they must inherit python and be installed in:
-#$(python_get_sitedir)/$package-name
-
-#the user should be the one created here username=group=jabber
-
-src_install() {
-	keepdir /etc/jabber
-	keepdir /var/run/jabber
-	keepdir /var/spool/jabber
-	keepdir /var/log/jabber
-}
-
-pkg_postinst() {
-	# Users should not be created in src_install see bug #124680
-	# Add our default jabber group and user
-	enewgroup jabber
-	enewuser jabber -1 -1 -1 jabber
-	# We can't use fowners & fperms convenience wrappers as we are outside the sandbox
-	chown jabber:jabber /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
-	chmod 770 /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
-}