gentoo resync : 24.12.2018

3 files changed, 2 insertions, 40 deletions

diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index f050bfdd49be..91f5806721f8 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,5 +1,4 @@
 AUX openobex-1.7.2-version.h.patch 621 BLAKE2B 90ef501688d2313b70d755a5d6233c027eade70870bb135c018eea180993d5138fdaf614fd1cc396a1521a2d522f8d03c132dc3d3c14839664c7021fc2e657b4 SHA512 9c060d3f4af4ca78ccbc931df26311d1e37c1a86279a56358eb468162746ef3e3d6324fd419f9b38c072ae4c1bb0e9df64643b5de0cdb876aff54530daa83262
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
-EBUILD openobex-1.7.2-r1.ebuild 1056 BLAKE2B 44ad7ef4ff2af83f131f0d70c3f2f72ed5b8128a38ef5f4c3bcbf654d598417f07a5ec07af4a700087b7f343979a9c7d7c5cf1b6918b131d69d0ef5f2eb661cb SHA512 00f0761d0dc44805442b99c7440765c0c6b3c187bad5bc9eb009a1cc5d359b3a7889dd5568c673e801e317313f47bdff20f783401f958e188812dd611ca2661d
-EBUILD openobex-1.7.2.ebuild 915 BLAKE2B c54c4903a1c3f03284c1cdfc4cf354147b7c64aa22ea048885f35e3fd9b60ce3f657630e872f5cc390a3f336acf23f753170851d541924a2d408a31c76a1c88c SHA512 dd2b3c22c5fb5815916e2f4a62bd422b2f18d755040f5649de4ba63661f4725efd7a32b450d6b9a7114d82cf52b21823556441a50812b61070f27d01e4717e41
+EBUILD openobex-1.7.2-r1.ebuild 1055 BLAKE2B bf58d40d55db3a9d51a0b032f3342b0ab1c7f6428db4de40aadb242a49f8bac3c5935c2e12a4d1450bbb9531311f4d6a1e138cffca2d71a720061ce62a4d44ce SHA512 1ad98eddb4b2ea6561add36053f42b7713747c96834c0111a68906ccf316ca74931b93f1e724ba1f4dd256c549e75a26e9f9c99d7ecea2ff0062367239369b45
 MISC metadata.xml 550 BLAKE2B 4505f0b70a901fbbf3cebe1a066d4c9275853a7667abf221ff439cb6783f485c5d43a24c8abf05df5757a8578712fffbc8a1ff43e0f16f8f8507417e32654ef2 SHA512 19bbed2e27c2fd9ebf00552d3443d09bb295f81c7637d2d09850d5bfc6128f6f3a7642ae55760c36308f7fe333319d6d8324cde0fc75781d32a486abb32be4fe
diff --git a/dev-libs/openobex/openobex-1.7.2-r1.ebuild b/dev-libs/openobex/openobex-1.7.2-r1.ebuild
index 833af72107fe..edcdf803d0a7 100644
--- a/dev-libs/openobex/openobex-1.7.2-r1.ebuild
+++ b/dev-libs/openobex/openobex-1.7.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="bluetooth doc irda usb"
 
 RDEPEND="
diff --git a/dev-libs/openobex/openobex-1.7.2.ebuild b/dev-libs/openobex/openobex-1.7.2.ebuild
deleted file mode 100644
index b03a5bf4590e..000000000000
--- a/dev-libs/openobex/openobex-1.7.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils udev
-
-DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices"
-HOMEPAGE="https://sourceforge.net/projects/openobex/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
-IUSE="bluetooth irda usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:= )
-	usb? ( virtual/libusb:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-Source
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPENOBEX_BLUETOOTH=$(usex bluetooth)
-		-DOPENOBEX_IRDA=$(usex irda)
-		-DOPENOBEX_USB=$(usex usb)
-		# TODO: enable them. patch would be appreciated.
-		-DBUILD_DOCUMENTATION=OFF
-
-		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)/rules.d"
-	)
-
-	cmake-utils_src_configure
-}