From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 19 Jan 2018 23:03:26 +0000 (+0100)
Subject: profiles: Remove last-rited app-cdr/qpxtool, media-gfx/wally
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ec2ced50253311f2baee6bb59afaa11281f62a23;p=gentoo.git

profiles: Remove last-rited app-cdr/qpxtool, media-gfx/wally

Closes: https://bugs.gentoo.org/629032
Closes: https://bugs.gentoo.org/637108
---

diff --git a/app-cdr/qpxtool/Manifest b/app-cdr/qpxtool/Manifest
deleted file mode 100644
index af3c609998e5..000000000000
--- a/app-cdr/qpxtool/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qpxtool-0.7.2.tar.bz2 587694 BLAKE2B 15a507c7def255cd0cd98cb2b70927a6691038097a0893c4dbc7951c96d52b1fd88015b3c86339e6e708fd13a4c6bb55c73737baad48bcc689079fb7564f0321 SHA512 e9384583ebdbcf450ef4fc637d9d99ac6598a5217caecb7c46e2f844e25f8808806eb31f08530a7d89f8b31247141413c306529780dbb71d992140de34a8877c
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.0-libpng15.patch b/app-cdr/qpxtool/files/qpxtool-0.7.0-libpng15.patch
deleted file mode 100644
index b1be8dba1135..000000000000
--- a/app-cdr/qpxtool/files/qpxtool-0.7.0-libpng15.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- console/f1tattoo/f1tattoo.cpp
-+++ console/f1tattoo/f1tattoo.cpp
-@@ -96,6 +96,10 @@
- 	int      c;
- 	int32_t  r,g,b;
- 
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
-+
- 	if (fread(header, 1, 8, fp) < 8) {
- 		printf("Error reading PNG header\n");
- 		fclose(fp);	
-@@ -129,9 +133,9 @@
- 
- 	png_read_info(png_ptr, info_ptr);
- 
--	printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
-+	printf("Image size: %ld x %ld\n", png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr));
- 
--	if (info_ptr->width != 3744U || info_ptr->height != rows ) {
-+	if (png_get_image_width(png_ptr, info_ptr) != 3744U || png_get_image_height(png_ptr, info_ptr) != rows ) {
- 		printf("Image should be 3744 x %d", rows);
- 		return 1;
- 	}
-@@ -143,14 +147,14 @@
- 	number_of_passes = png_set_interlace_handling(png_ptr);
- 	png_read_update_info(png_ptr, info_ptr);
- 
--	printf("Color type: [%d] ", info_ptr->color_type);
--	switch (info_ptr->color_type) {
-+	printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
-+	switch (png_get_color_type(png_ptr, info_ptr)) {
- 	    case PNG_COLOR_TYPE_GRAY:
- 			printf("PNG_COLOR_TYPE_GRAY\n");
- 			break;
- 	    case PNG_COLOR_TYPE_PALETTE:
- 			printf("PNG_COLOR_TYPE_PALETTE\n");
--			if (!(info_ptr->valid & PNG_INFO_PLTE)) {
-+			if (!(png_get_valid(png_ptr,info_ptr,PNG_INFO_PLTE))) {
- 				printf("PNG color type is indexed, but no palette found!");
- 				goto err_read_png;
- 			}
-@@ -168,49 +172,49 @@
- 			printf("unlnown PNG color type!\n");
- 			goto err_read_png;
- 	}
--	printf("Bit depth : %d\n", info_ptr->bit_depth);
--	if (info_ptr->bit_depth != 8) {
-+	printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
-+	if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
- 		printf("Unsupported bit depth!\n");
- 		goto err_read_png;
- 	}
--	if (info_ptr->valid & PNG_INFO_PLTE) {
--		printf("Palette   : %d colors\n", info_ptr->num_palette);
-+	if (png_get_valid(png_ptr,info_ptr,PNG_INFO_PLTE)) {
-+		printf("Palette   : %d colors\n", num_palette);
- 	} else {
- 		printf("Palette   : NO\n");
- 	}
--	printf("ROW bytes : %ld\n", info_ptr->rowbytes);
-+	printf("ROW bytes : %ld\n", png_get_rowbytes(png_ptr, info_ptr));
- 
- 
- 	raw_row_pointer = buf;
--	png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
-+	png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr));
- 	for (row=0; row<rows; row++) {
- 		if (setjmp(png_jmpbuf(png_ptr))) {
- 			printf("png_jmpbuf failed!\n");
- 			goto err_read_png;
- 		}
- 		png_read_row(png_ptr, png_row_pointer, NULL);
--		if (info_ptr->width < 3744U)
-+		if (png_get_image_width(png_ptr, info_ptr) < 3744U)
- 			memset(raw_row_pointer, 0, 3744);
- 
--		switch (info_ptr->color_type) {
-+		switch (png_get_color_type(png_ptr, info_ptr)) {
- 		    case PNG_COLOR_TYPE_GRAY:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					raw_row_pointer[col] = png_row_pointer[col] ^ 0xFF;
- //					memcpy(raw_row_pointer, png_row_pointer, 3744);
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_PALETTE:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					c = png_row_pointer[col];
--					r = info_ptr->palette[c].red;
--					g = info_ptr->palette[c].green;
--					b = info_ptr->palette[c].blue;
-+					r = palette[c].red;
-+					g = palette[c].green;
-+					b = palette[c].blue;
- 					c = (r*11 + g*16 + b*5) / 32;
- 					raw_row_pointer[col] = c ^ 0xFF;
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_RGB:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					r = png_row_pointer[col*3];
- 					g = png_row_pointer[col*3+1];
- 					b = png_row_pointer[col*3+2];
-@@ -219,7 +223,7 @@
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_RGB_ALPHA:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					r = png_row_pointer[col*4];
- 					g = png_row_pointer[col*4+1];
- 					b = png_row_pointer[col*4+2];
-@@ -228,7 +232,7 @@
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_GRAY_ALPHA:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					raw_row_pointer[col] = png_row_pointer[col*2] ^ 0xFF;
- 				}
- 				break;
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race.patch b/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race.patch
deleted file mode 100644
index 9192a90a7892..000000000000
--- a/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- qpxtool-0.7.0/gui/updateqm.pri.orig	2010-01-25 19:44:45.061640334 +0100
-+++ qpxtool-0.7.0/gui/updateqm.pri	2010-01-25 19:40:03.711640850 +0100
-@@ -0,0 +1,19 @@
-+isEmpty(QMAKE_LRELEASE) {
-+
-+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
-+
-+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
-+
-+}
-+
-+updateqm.input = TRANSLATIONS
-+
-+updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
-+
-+updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
-+
-+updateqm.CONFIG += no_link
-+
-+QMAKE_EXTRA_COMPILERS += updateqm
-+
-+PRE_TARGETDEPS += compiler_updateqm_make_all
---- qpxtool-0.7.0/gui/qpxtool.pro.orig	2010-01-25 19:46:45.011641756 +0100
-+++ qpxtool-0.7.0/gui/qpxtool.pro	2010-01-25 19:47:08.397640627 +0100
-@@ -2,6 +2,8 @@
- # Automatically generated by qmake (2.01a) ?? ???. 24 12:26:02 2009
- ######################################################################
- 
-+include( updateqm.pri )
-+
- MOC_DIR=moc
- OBJECTS_DIR=obj
- QT+=network
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch b/app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch
deleted file mode 100644
index ef46e5e6a23c..000000000000
--- a/app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qpxtool-0.7.2/gui/qpxtool.pro
-+++ qpxtool-0.7.2/gui/qpxtool.pro
-@@ -13,6 +13,8 @@
- DEPENDPATH += . include locale src
- INCLUDEPATH += . include
- 
-+LIBS+=-L../lib/lib -lqpxtransport
-+
- # Input
- HEADERS += include/about.h \
-            include/abstractpreview.h \
diff --git a/app-cdr/qpxtool/metadata.xml b/app-cdr/qpxtool/metadata.xml
deleted file mode 100644
index 6d7d01508cd0..000000000000
--- a/app-cdr/qpxtool/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">qpxtool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/qpxtool/qpxtool-0.7.2.ebuild b/app-cdr/qpxtool/qpxtool-0.7.2.ebuild
deleted file mode 100644
index 0482a6374c6e..000000000000
--- a/app-cdr/qpxtool/qpxtool-0.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="CD/DVD quality checking utilities"
-HOMEPAGE="http://qpxtool.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtsql:4
-	media-libs/libpng"
-
-DOCS="AUTHORS ChangeLog README SupportedDevices TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.0-locale-install-race.patch \
-		"${FILESDIR}"/${PN}-0.7.0-libpng15.patch \
-		"${FILESDIR}"/${PN}-0.7.2-libs.patch
-}
-
-src_configure() {
-	tc-export CXX
-	./configure --prefix=/usr || die
-	cd gui || die
-	mv -v Makefile{,.orig} || die "Backup Makefile for install"
-	qt4-r2_src_configure
-}
-
-src_install() {
-	mv -v gui/Makefile.orig gui/Makefile || die "Restore Makefile for install"
-	dodir /usr/bin
-	dohtml status.html
-	qt4-r2_src_install
-}
diff --git a/media-gfx/wally/Manifest b/media-gfx/wally/Manifest
deleted file mode 100644
index 3e2d66da92a2..000000000000
--- a/media-gfx/wally/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wally-2.4.5.tar.gz 1601018 BLAKE2B d196fa42b6ed543e074a1a606ef3686fb3ba4204bda23a0c5e8dbf2ac4b8ffc5a2bed528491d5ecd6cc93762d7776af6249a5ab6f86ee0b51ef751a8581016cf SHA512 d0b81478fa2e7690136aa811b761ebf2f8a5daf4e2b736d67b72e1b874d0ec5e3020bb97d52b30c79411b8c4a50c6e05a44051cc87157b012f5a7f60b085faa5
diff --git a/media-gfx/wally/files/wally-2.2.0-disable_popup.patch b/media-gfx/wally/files/wally-2.2.0-disable_popup.patch
deleted file mode 100644
index 9d482eb231c0..000000000000
--- a/media-gfx/wally/files/wally-2.2.0-disable_popup.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/wallyplugin/CMakeLists.txt
-+++ b/wallyplugin/CMakeLists.txt
-@@ -26,6 +26,3 @@ install(TARGETS plasma_wallpaper_wallypl
- 
- install(FILES plasma-wallpaper-wallyplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- install(FILES wallyplugin.png DESTINATION ${ICON_INSTALL_DIR}/oxygen/16x16/apps)
--
--install(CODE "execute_process(COMMAND kbuildsycoca4 OUTPUT_QUIET ERROR_QUIET)")
--install(CODE "execute_process(COMMAND kdialog --title \"WallyPlugin\" --msgbox \"WallyPlugin will be loaded next time KDE is started. Please select it in Appearance Settings.\")")
diff --git a/media-gfx/wally/metadata.xml b/media-gfx/wally/metadata.xml
deleted file mode 100644
index 39c300404c08..000000000000
--- a/media-gfx/wally/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">wally</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-gfx/wally/wally-2.4.5.ebuild b/media-gfx/wally/wally-2.4.5.ebuild
deleted file mode 100644
index e22dcfe2f182..000000000000
--- a/media-gfx/wally/wally-2.4.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils xdg-utils
-
-DESCRIPTION="Qt4 wallpaper changer"
-HOMEPAGE="http://www.becrux.com/index.php?page=projects&name=wally"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	media-libs/libexif
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README README.XFCE4 README.shortcuts TODO )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable_popup.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSTATIC=FALSE
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDE4=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon "${S}"/res/images/idle.png wally.png
-	make_desktop_entry wally Wally wally "Graphics;Qt"
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 2ded8b0ebb3d..8fef23509e49 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -704,16 +704,6 @@ x11-misc/qsynergy
 # Masked for removal in 30 days.
 app-editors/znotes
 
-# Andreas Sturmlechner <asturm@gentoo.org> (21 Dec 2017)
-# Dead upstream, depends on dead Qt4.
-# Bug #629032. Masked for removal in 30 days.
-media-gfx/wally
-
-# Andreas Sturmlechner <asturm@gentoo.org> (21 Dec 2017)
-# Dead upstream, depends on dead Qt4.
-# Bug #637108. Masked for removal in 30 days.
-app-cdr/qpxtool
-
 # Patrice Clement <monsieurp@gentoo.org> (19 Dec 2017)
 # A slightly better syntax file for PAM configuration files is shipped with Vim
 # since version 8.0. The one we package is old and out of date.