gentoo resync : 05.04.2019

3 files changed, 63 insertions, 16 deletions

diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 8982b36acec0..10edb5a1b0db 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,3 +1,4 @@
+AUX kdbg-3.0.0-no-png-install.patch 1801 BLAKE2B 69d1f3f589a4a0376149a9e601bc9d97723b04a5074eac15a5aeec10dba54f42b66b6e232e8b32b69d6d3c19062512f6cbed1323d3efaec538c847829b8f7149 SHA512 d1aa8518a56a0f46f0e7a13e9649f5fe26cdce162664d63911b387718d4d6416ce08dcba6d3d0bf831b473be906a8ec160c942e6e78bb58a05ca4cf85642f38a
 DIST kdbg-3.0.0.tar.gz 430150 BLAKE2B 62411f95f1d109d95647e83defc2f5a84f9f7d7dc715f5a2f84eb6ecd18c7e1d02da0d68bf5bc8bb37216f98edbac11c24286f03ffc2ab9ad9fc7203ccd498dd SHA512 6398a7bbb9c744a837dd73645b497ab00eeaca9a326d61b135dc9040c616b4a2bdc0cf1da59c101dc68a159e12bc3b4a994a9d1dbf33f7d152e5c3003abb498a
-EBUILD kdbg-3.0.0.ebuild 1191 BLAKE2B affd50a6189911e15bf5566277a7a23142f38bb04392dafb4f89e8694eea72acfc3811f4e60bf40a65e1bcae6feed27b7f26fc6ade4e8daa6fe0e7ef88f05ca1 SHA512 7d1c924e50ec68175a6c4157044c5738a8f6abfc1b32a19d611e79842ee04ffcb3aee38c53cd016427c68d78acdefe634754eddf07c114edf772847ad01b323a
+EBUILD kdbg-3.0.0-r1.ebuild 989 BLAKE2B 69f68ed63de7fba3054839559953a743181f664d81d8dffa8bb6f331f6334ba39ea53d931c6c320b3e42d844e6bc4522640d2714361a72556107543efec409cc SHA512 b69f06370ca8c622babf21edc44df93f2e9bf21e2acbd9ddf8c1cb5fc35ae299ed95923e8f4b0131123d6c7be66f0861a2ff86fb140accfffa7890a8cce588c6
 MISC metadata.xml 371 BLAKE2B fe7d9700b798150f83b58f44ae125090c0af51f6d6e81d7c5048828e75d9b95147a01c009b5bb195e6d6fbeb047dc019059802e3f60e02e59596f2f027c7ec4a SHA512 70d360d6ff4a809578a61351cdd5bdc42b6bc72eb6551ef8083595d941909f1c6ab91a4cb793f1161eaad3a65e0313e498bef0cc5e763a918d2e83c7352f7805
diff --git a/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch b/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch
new file mode 100644
index 000000000000..237feaa981bd
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch
@@ -0,0 +1,54 @@
+From 826d503da8bfe7c567fc44dee178a4fca2b52f0a Mon Sep 17 00:00:00 2001
+From: Johannes Sixt <j6t@kdbg.org>
+Date: Fri, 15 Feb 2019 20:26:03 +0100
+Subject: [PATCH] Do not install the pulse frames.
+
+Andreas Sturmlechner noticed that the frame PNGs are slightly broken:
+
+  .../pulse000000.png: broken IDAT window length
+
+Since the PNGs are only needed to build pulse.mng, do not install them.
+---
+ kdbg/pics/CMakeLists.txt | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
+
+diff --git a/kdbg/pics/CMakeLists.txt b/kdbg/pics/CMakeLists.txt
+index 41625b3..9615b1b 100644
+--- a/kdbg/pics/CMakeLists.txt
++++ b/kdbg/pics/CMakeLists.txt
+@@ -31,35 +31,6 @@ set(PICTOGRAMS
+ install(FILES ${PICTOGRAMS} DESTINATION "${DATA_INSTALL_DIR}/kdbg/pics")
+ 
+ ecm_install_icons(ICONS
+-    22-actions-pulse000000.png
+-    22-actions-pulse000001.png
+-    22-actions-pulse000002.png
+-    22-actions-pulse000003.png
+-    22-actions-pulse000004.png
+-    22-actions-pulse000005.png
+-    22-actions-pulse000006.png
+-    22-actions-pulse000007.png
+-    22-actions-pulse000008.png
+-    22-actions-pulse000009.png
+-    22-actions-pulse000010.png
+-    22-actions-pulse000011.png
+-    22-actions-pulse000012.png
+-    22-actions-pulse000013.png
+-    22-actions-pulse000014.png
+-    22-actions-pulse000015.png
+-    22-actions-pulse000016.png
+-    22-actions-pulse000017.png
+-    22-actions-pulse000018.png
+-    22-actions-pulse000019.png
+-    22-actions-pulse000020.png
+-    22-actions-pulse000021.png
+-    22-actions-pulse000022.png
+-    22-actions-pulse000023.png
+-    22-actions-pulse000024.png
+-    22-actions-pulse000025.png
+-    22-actions-pulse000026.png
+-    22-actions-pulse000027.png
+-    22-actions-pulse000028.png
+     22-actions-pulse.mng
+     DESTINATION "${DATA_INSTALL_DIR}/kdbg/icons"
+     THEME hicolor
\ No newline at end of file
diff --git a/dev-util/kdbg/kdbg-3.0.0.ebuild b/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
index d6e46f2cfd5a..e8543c0a37c6 100644
--- a/dev-util/kdbg/kdbg-3.0.0.ebuild
+++ b/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="true"
 inherit kde5
@@ -11,10 +11,10 @@ HOMEPAGE="http://www.kdbg.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS=""
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -26,13 +26,12 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!dev-util/kdbg:4
 	sys-devel/gdb
 "
-DEPEND="${COMMON_DEPEND}
-	media-libs/libpng:0
-"
+
+PATCHES=( "${FILESDIR}/${P}-no-png-install.patch" )
 
 src_prepare() {
 	# allow documentation to be handled by eclass
@@ -40,12 +39,5 @@ src_prepare() {
 	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
 	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die
 
-	local png
-	for png in kdbg/pics/*.png; do
-		pngfix -q --out=${png/.png/fixed.png} ${png}
-		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-		mv -f ${png/.png/fixed.png} ${png} || die
-	done
-
 	kde5_src_prepare
 }