gentoo resync : 15.12.2019

3 files changed, 2 insertions, 43 deletions

diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest
index 633cbf4b9dbd..9fdeb5e71da1 100644
--- a/net-im/bitlbee-facebook/Manifest
+++ b/net-im/bitlbee-facebook/Manifest
@@ -1,6 +1,4 @@
-DIST bitlbee-facebook-1.1.2.tar.gz 67269 BLAKE2B 7f6b9c3706a6955d49dd79e7ee25e252679838468011a5044b0e8fa140cd7d144fca86ef9d65fccb65b9c1844348dcca292a3cde16c9371264e252d28dc1cbf8 SHA512 3e27935cd4c8c1d55de9dfe9d6fd1e7aef1bf410e64c711436875ddfb83f67f1da0055af3b279d2d6627bafe438a7689e280c2bfd51ec4f64cf7c614182003da
 DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4
-EBUILD bitlbee-facebook-1.1.2.ebuild 742 BLAKE2B 8dec3e7611fd4ddb1d56eb13b6619252dce287e88d8ba1186e427f63e97ae4565ec05da858dde14e3133ccd4afbae138aeec9ce521abe3b2a087062d08457f64 SHA512 49ab591bebae9b1ec0bc8ebbd7ab646ee91ca2aa00c9075b003130bf0426d1157ef1171cffcfe131112888022918cef92102e82f1bce18568cf4a8635bf23ca4
-EBUILD bitlbee-facebook-1.2.0.ebuild 753 BLAKE2B 27a143ad5011f02145a6f15341da55b954272fea34a001c48bc2690255928bb81f636de9cb4310b9b54ea4c4d3637b3be818736e20cdc606deb17b94367e39fc SHA512 21302c339cbf958640919e11ea0e5417c581592bc5273e26fd7e2e3886234263f0e4e1942bcce913f478b5df153b6676846c03a730d128dcfd357c82042890ef
+EBUILD bitlbee-facebook-1.2.0.ebuild 751 BLAKE2B f6e26cabe57d09ba3cf2764c9252d745b80297c59e62068b81ac16ac63bf4500004671d533111a28ca870058089f4a4753af7d3894d6433d8aa6d75a825a6e33 SHA512 5ffad5d5a76fceeb5f9264d0649cc39c6df296b1941a25a043ba5b975a9a6a1b8c2aa343deafd5ea0b822e5fdc6b88bf992a65530633fda60696282b022a363d
 EBUILD bitlbee-facebook-9999.ebuild 753 BLAKE2B 27a143ad5011f02145a6f15341da55b954272fea34a001c48bc2690255928bb81f636de9cb4310b9b54ea4c4d3637b3be818736e20cdc606deb17b94367e39fc SHA512 21302c339cbf958640919e11ea0e5417c581592bc5273e26fd7e2e3886234263f0e4e1942bcce913f478b5df153b6676846c03a730d128dcfd357c82042890ef
 MISC metadata.xml 772 BLAKE2B a9465736a151d872629d24e5343ccc597fc42a4683e6047ed4a7dbddc7e352456c33fb641fe44816cf02f9cc9b0ef094fbc0b895ff12e52ac094bcfef8a4e67c SHA512 a9d4c404c7668a04156077af1a7e25f7df068a424060ca69a98a46bd8fc104a1f13c51c8891534429449c3ed036980443a36e9bc52d3c6cb21e8ef3a4f7f877b
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild
deleted file mode 100644
index 5e6c0743780d..000000000000
--- a/net-im/bitlbee-facebook/bitlbee-facebook-1.1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Facebook protocol plugin for BitlBee"
-HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit	git-r3
-	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
-else
-	SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	>=net-im/bitlbee-3[plugins]"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild
index f7a43704ab51..79bb0580ebe6 100644
--- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild
+++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
 else
 	SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 RDEPEND="