gentoo resync : 25.01.2018

3 files changed, 6 insertions, 57 deletions

diff --git a/app-backup/luckybackup/Manifest b/app-backup/luckybackup/Manifest
index ac82df74194b..8ba05fa49307 100644
--- a/app-backup/luckybackup/Manifest
+++ b/app-backup/luckybackup/Manifest
@@ -1,5 +1,3 @@
-DIST luckybackup-0.4.8.tar.gz 5710203 BLAKE2B a0efe350aecaae759cb8c7d2f51eeaa71caa7b267064ccb0a49f44465df53b6b2a41ebbd6794a5bdd2b44b8d1a402648da0ff243880237c6e3d64d505b5d5bd9 SHA512 48e73f8b5897a09f64f3755dc094ef50031c607ecfca25c238b45ca5bef7f2645081b7c665a9b7c3c3da2f214f91b229a559d723df8ddb6446aa23e68b266076
 DIST luckybackup-0.4.9.tar.gz 5954338 BLAKE2B 632738f8c422ba7d56536fae866ce31d224910b41495e4df3be28a8013ba776e30b4d8e70ceb26c92d28aaf70c96402f27687c55d8f5d7aa5d405bab506a66be SHA512 86d6f1bd84f3bfd89734f0f2066cb17bbf9b4ede96167398de03a460c14d24bf4b50a91bb380655ace9a23497271e102b940ea99a7595cf17f596660dae7f7dd
-EBUILD luckybackup-0.4.8.ebuild 1589 BLAKE2B 677d7185c631643d64bb223b8cdc4320eaec1d5feaddcc922384e8eeda606cf1249980eed56215f15f115ac3d2850f395066e5aaa33c458f5e53960656eefe76 SHA512 0c253be84b2f951c16ce0b98bbb35691798277ef91239261e7c2f89f77113ba54d598ba25d9b1228fc35d9e93547ab1088c7530c83fc5d8ac50d8e2a81900ea3
-EBUILD luckybackup-0.4.9.ebuild 1351 BLAKE2B 8540ca395ba3628f6002989989dcae31aa3ebefe75528bd79b6e7189f14a0c34f4566fa7d1dbace263e38da1c7971ed12c3cab5ba136a384e79ad652e5cddf38 SHA512 c261abfc103f7f7a3c1819de4d11f9c76d5ede7083a264e9abf1b7ab0da38939286429cbb328a12ba760b07e448cd6844117dea80f7cd494c5b3f6dd9d84e99d
+EBUILD luckybackup-0.4.9.ebuild 1442 BLAKE2B 07b9b559b32179733248d205b862f5e4eb1e4ccbf1e4fcd6ea63a0c07ffee7436055236bfc12fcc9aebfacd53b279379c1a0ee3d4d132fb892679f3cc338da4a SHA512 68d4d5e8b5d70b1b2a20471e97c65459969d2f7486fe700e1e18031c68eb612776970a2ac411b17cf8bc83e34e51dd87175bbfd62b405cbedecd32499eaf8cb8
 MISC metadata.xml 328 BLAKE2B b41ac27e6b5c14d5c6bf9df4a47291ffe57bc679b06ab27b3cf9135be123195a161be705ffd2349f3cc4a5f618c2e75740a677696afa244a3a3716be625aa223 SHA512 64415b71b483e93f41d75f858bbdbce2c612b5e7c37753237d7c2374b1bb2bd2d30a86d18b32f5ac015e15c57e94553019756d2cc6021c803d25da527929ddeb
diff --git a/app-backup/luckybackup/luckybackup-0.4.8.ebuild b/app-backup/luckybackup/luckybackup-0.4.8.ebuild
deleted file mode 100644
index e8d3c5b6247d..000000000000
--- a/app-backup/luckybackup/luckybackup-0.4.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="bs ca cs de el en es fr it nl no pl pt_BR ro ru sk sl sv tr zh_TW"
-inherit l10n qt4-r2
-
-DESCRIPTION="Powerful and flexible backup (and syncing) tool, using RSync and Qt4"
-HOMEPAGE="http://luckybackup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	net-misc/rsync"
-
-DOCS=( readme/{AUTHORS,README,TODO,TRANSLATIONS,changelog} )
-
-rm_loc() {
-	sed -i -e "s|translations/${PN}_${1}.ts||" "${PN}.pro" || die 'sed on translations failed'
-	rm "translations/${PN}_${1}."{ts,qm} || die "removing ${1} locale failed"
-}
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:g" \
-		-e "s:/usr/share/doc/packages/${PN}:/usr/share/doc/${PF}:g" \
-		luckybackup.pro src/global.h || die "sed failed"
-
-	# The su-to-root command is an ubuntu-specific script so it will
-	# not work with Gentoo. No reason to have it anyway.
-	sed -i -e "/^Exec/s:=.*:=/usr/bin/${PN}:" menu/${PN}-gnome-su.desktop \
-		|| die "failed to remove su-to-root"
-
-	# causes empty directory to be installed
-	sed -i -e '/^INSTALLS/s/debianmenu //' luckybackup.pro \
-		|| die "sed installs failed"
-
-	# remove text version - cannot remote HTML version
-	# as it's used within the application
-	rm license/gpl.txt || die "rm failed"
-
-	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do rm_loc
-	qt4-r2_src_prepare
-}
diff --git a/app-backup/luckybackup/luckybackup-0.4.9.ebuild b/app-backup/luckybackup/luckybackup-0.4.9.ebuild
index 4ae8962c48c1..eab1f1a17131 100644
--- a/app-backup/luckybackup/luckybackup-0.4.9.ebuild
+++ b/app-backup/luckybackup/luckybackup-0.4.9.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
@@ -39,6 +39,9 @@ src_prepare() {
 	sed -i -e '/^INSTALLS/s/debianmenu //' luckybackup.pro \
 		|| die "sed installs failed"
 
+	# bogus dependency - bug #645732
+	sed -i -e '/QT += network/s/^/#/' luckybackup.pro || die
+
 	# remove text version - cannot remote HTML version
 	# as it's used within the application
 	rm license/gpl.txt || die "rm failed"