gentoo resync : 18.11.2018

4 files changed, 2 insertions, 96 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index d0a4ac2b48e5..d1cff6c61e06 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/sobexsrv/Manifest b/app-mobilephone/sobexsrv/Manifest
index bfbc850d9dd5..801a8cb8ff84 100644
--- a/app-mobilephone/sobexsrv/Manifest
+++ b/app-mobilephone/sobexsrv/Manifest
@@ -3,6 +3,5 @@ AUX init.d_sobexsrv 1473 BLAKE2B f5ed1fccc6de4419a62185fee1460b2acbd101602c09b51
 AUX sobexsrv-1.0.1-openobex16.patch 1346 BLAKE2B ec63105eb6db6fd959044134fd66b8b3018093a5efec4b6b6b63c45d9bcca84c678addc56bfefaad0fca1696c148107513a1640473cb37f5320c2fab9a623ded SHA512 a1db1a916c0c2f6f237a4434bf1f11b0b6f540ad62fa9687d886e4ff97f6bb916be7763a24bdc56bf8fd3334ead426e0ed2003c0208c3c743f49b13b2bf8ab2a
 DIST sobexsrv-1.0.1-fix64.patch 25040 BLAKE2B 9796779fdde39c79371a978d4bdb9d6761f9467ecc353096c3d1b13fe1d5aa4f7ceef137d07c52467a175b7bc756e6c747a2800a2dbb2dcd281be463499106c9 SHA512 9d555bee8d03c13061bbe132df6442daa4d8817ef713e92e5150b1994af110c5b01b34f8bcc1c3ae734529e36bb70f56976ab261f860e95e3de3ffe440a7b393
 DIST sobexsrv-1.0.1.tar.gz 27683 BLAKE2B f1aa103aa8a70ea7408ced7b0a3944d0ba61dc9750425160ee95bb69e1f1cf4479fbecef7be3ba4b6cbec2a7f518bed18318ca694545a4606888e7663adb0d38 SHA512 52fe5eff812596caa1f4b8579740ce8b2591db17950d68c093cfdb33ca5b899bfc5c142594843948a29ae0b1bdbe4499a1e24c270c92e61d02fd07a02d9d40cd
-EBUILD sobexsrv-1.0.1-r1.ebuild 1997 BLAKE2B ff1f1ee9b4e2f151744a4e85564c03109871af976c472c454d67db26564d4de199a3e8aac34552e081df3c8f85e0dba75ca7b9cfdb13e1aa6d905967b58c01b5 SHA512 c6df47e37562c499f5fcdc362d463ab008af8743f0dce91ab77f1260a51041f22c5010f45d895fd19b523cef3e27af101e05e46e3ff3a6df7bc0a65b3b4add28
-EBUILD sobexsrv-1.0.1-r2.ebuild 2008 BLAKE2B 18a41fee7454e99be4060c571bbee93cf1f153dbaf6073c136f1db82bc2124ee7e917be1ab389240b0f349cdc11764388b4e6e8a1283d59f76464487ef8c3fda SHA512 ca4b18a12c4ddb7898957a1b26bc2e28e5dd30949b7294ddda19682485fc0a31d82514d468cac4ae3c82ef9a88f66720aeb7bb670f10cbe094a4f0f54bb6e6b2
+EBUILD sobexsrv-1.0.1-r2.ebuild 2005 BLAKE2B 28fedfe5d4f64bc696d1f481a9855c57bbeb0ae8e6ca0fa9cd493b718051089abb3f17ee96c526f07600d33050bd57c6940d1b7d9178310d2c6735a6dde51071 SHA512 1a60a31ea11f4b21039fcd5e4694fa0d5c5b91c11fccb09d362a8d7862885f2c628f6f52b736db4347fd29a3e6a63b2375868d5771363c2dde272eac2e692637
 MISC metadata.xml 920 BLAKE2B ac1ea1fc1f85d7dd43c548d89ef3473bb5b78f2e3ab4275c28db702865e492261db1ab908496661ebda406771d7d8080e9057bed865b703b9920ee86b48c8b34 SHA512 30b149f3e197dc0a45cd27a618a0dcc6c9968dae44576c47dd6ebdedda06d5fed8b03ae1e0f94133804551366a90a97614d5d5eca334dbdabd4398278645aab9
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
deleted file mode 100644
index 14cde193148e..000000000000
--- a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs user
-
-MY_P="${P/_pre/pre}"
-
-DESCRIPTION="Scripting/Secure OBEX Server (for BlueZ Linux)"
-SRC_URI="http://www.mulliner.org/bluetooth/${MY_P}.tar.gz
-		 https://dev.gentoo.org/~joker/${P}-fix64.patch"
-HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk"
-
-DEPEND="
-	dev-libs/openobex
-	net-wireless/bluez
-	gtk? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	gtk? (
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.2
-	)"
-REQUIRED_USE="
-	gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${DISTDIR}/${P}"-fix64.patch
-	"${FILESDIR}/${P}"-openobex16.patch
-)
-
-pkg_setup() {
-	use gtk && python-single-r1_pkg_setup
-
-	enewgroup sobexsrv
-	enewuser sobexsrv -1 -1 /var/spool/sobexsrv sobexsrv
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:/usr/man/man8:/usr/share/man/man8:' \
-		-e 's/install: all/install:/' \
-	    -i Makefile || die
-
-	sed -e 's/^CFLAGS =/CFLAGS +=/' \
-	    -e 's/^CC =/CC ?=/' \
-	    -e 's/$(CC) $(CFLAGS)/$(CC) $(LDFLAGS) $(CFLAGS)/' \
-	    -i src/Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	emake -C src
-}
-
-src_install() {
-	default
-	dodoc AUTHOR CONFIG SECURITY THANKS
-
-	if use gtk; then
-		python_doscript "${D}/usr/bin/sobexsrv_handler"
-		newdoc "${S}/scripts/test" sobexsrv_handler.sample_script
-	else
-		rm "${D}/usr/bin/sobexsrv_handler" || die
-	fi
-
-	newinitd "${FILESDIR}/init.d_sobexsrv" sobexsrv
-	newconfd "${FILESDIR}/conf.d_sobexsrv" sobexsrv
-
-	keepdir /var/spool/sobexsrv
-	fowners sobexsrv:sobexsrv /var/spool/sobexsrv
-}
-
-pkg_postinst() {
-	elog
-	elog "/usr/bin/sobexsrv is *NOT* installed set-uid root by"
-	elog "default. suid is required for the chroot option (-R)."
-	elog
-	elog "Execute the following commands to enable suid:"
-	elog
-	elog "chown root:sobexsrv /usr/bin/sobexsrv"
-	elog "chmod 4710 /usr/bin/sobexsrv"
-	elog
-}
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r2.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r2.ebuild
index 7cba2f73e84a..442f57871b07 100644
--- a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r2.ebuild
+++ b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gtk"
 
 DEPEND="