[gentoo-commits] repo/gentoo:master commit in: x11-libs/libyui/, x11-libs/libyui/files/

[Andreas Sturmlechner]

commit:     8cabe91a33845dde8d642c6c16b600c3712c928e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 22:10:11 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 22:10:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cabe91a

x11-libs/libyui: Drop old

Qt4 is dead.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 x11-libs/libyui/Manifest                           |  2 -
 .../files/libyui-3.0.13-fix-qt-libs-check.patch    | 34 ---------------
 x11-libs/libyui/libyui-3.0.13.ebuild               | 50 ----------------------
 x11-libs/libyui/libyui-3.2.5.ebuild                | 50 ----------------------
 4 files changed, 136 deletions(-)

diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
index fc2935eb06c..7eb785f0fdd 100644
--- a/x11-libs/libyui/Manifest
+++ b/x11-libs/libyui/Manifest
@@ -1,3 +1 @@
-DIST libyui-3.0.13.tar.gz 204028 BLAKE2B e5b958807e98c7bf3b89412dd8669967469e8eba8b37f3629fc081c1d92eb81083577267b2aa6e5570d58aefa8b270369da1cd5a83add8c7ead8ba0c5398f6d5 SHA512 b698c4d44d9fa1d888b52f8d5e2216ff4a490ef97c153fac52674a237527807140663d87ceac7b36b0c6092e9035eaec7bfe7a2e1e93922de106873130a69c66
-DIST libyui-3.2.5.tar.gz 218517 BLAKE2B c84808eab5e23d62ffe871f916c99f0a5b9913c98f212c9c581258bdb25ae273ada14ae408dffea7a6442e8e5fb96533c9cd93f512c446f4b192b4619a952927 SHA512 174ec6893f749bc81495c2ee620e8c7d85e9cdb61db08d4f7d800c13306eb76e0f40d20a1eafeb579344b35d99f9735b65e63525ddd804cbe30ab7f4c18bec43
 DIST libyui-3.3.3.tar.gz 230452 BLAKE2B 4be43bb4959eac5cd7c5974774130cb948367cae55dc83ad67b26d0c57f79cd1b8a7328b695478c450c3373167d0d74e2455e7804b4f25fd51b8386ceb113df1 SHA512 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f

diff --git a/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch b/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
deleted file mode 100644
index 63ac43ee1af..00000000000
--- a/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- buildtools/LibyuiCommon.cmake	2014-02-10 19:41:45.000000000 +0400
-+++ buildtools/LibyuiCommon.cmake	2014-09-10 23:16:10.317115440 +0400
-@@ -245,12 +245,17 @@
- 
- MACRO( FIND_LINKER_LIBS )	# try to find all libs to be linked against
-   FOREACH( p ${LIB_LINKER})
--    FIND_LIBRARY( ${p}_LOOKUP "${p}" )
--    IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
--      MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
--    ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
--      MESSAGE( STATUS "${p} found" )
--    ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+    STRING(FIND "${p}" "Qt" ISQT)
-+    IF( ISQT GREATER -1 )
-+        FIND_PACKAGE(Qt4 4.8 REQUIRED ${p})
-+    ELSE( ISQT GREATER -1 )
-+        FIND_LIBRARY( ${p}_LOOKUP "${p}" )
-+        IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+          MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
-+        ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+          MESSAGE( STATUS "${p} found" )
-+        ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+    ENDIF( ISQT GREATER -1 )
-   ENDFOREACH()
- 
- ENDMACRO( FIND_LINKER_LIBS )
-@@ -616,6 +616,7 @@
- 
-     QT4_AUTOMOC( ${${TARGETLIB}_SOURCES} )
-     QT4_WRAP_UI( ${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}" )
-+    LINK_DIRECTORIES( ${QT_LIBRARY_DIR} )
- 
-   ENDIF( QT_FOUND )
-

diff --git a/x11-libs/libyui/libyui-3.0.13.ebuild b/x11-libs/libyui/libyui-3.0.13.ebuild
deleted file mode 100644
index 5ed10cadaf7..00000000000
--- a/x11-libs/libyui/libyui-3.0.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library"
-HOMEPAGE="https://github.com/libyui/libyui"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk ncurses qt4 static-libs"
-
-# Only Boost headers are needed
-DEPEND="dev-libs/boost"
-PDEPEND="
-	qt4? ( x11-libs/libyui-qt:${SLOT} )
-	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
-	gtk? ( x11-libs/libyui-gtk:${SLOT} )
-	"
-
-PATCHES=( "${FILESDIR}/${P}-fix-qt-libs-check.patch" )
-
-REQUIRED_USE="|| ( gtk ncurses qt4 )"
-
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
-
-src_prepare() {
-	cp buildtools/CMakeLists.common CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
-	)
-	cmake-utils_src_configure
-}

diff --git a/x11-libs/libyui/libyui-3.2.5.ebuild b/x11-libs/libyui/libyui-3.2.5.ebuild
deleted file mode 100644
index b5c8ddfa616..00000000000
--- a/x11-libs/libyui/libyui-3.2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library"
-HOMEPAGE="https://github.com/libyui/libyui"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk ncurses qt4 static-libs"
-
-# Only Boost headers are needed
-DEPEND="dev-libs/boost"
-PDEPEND="
-	qt4? ( x11-libs/libyui-qt:${SLOT} )
-	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
-	gtk? ( x11-libs/libyui-gtk:${SLOT} )
-	"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.13-fix-qt-libs-check.patch" )
-
-REQUIRED_USE="|| ( gtk ncurses qt4 )"
-
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
-
-src_prepare() {
-	cp buildtools/CMakeLists.common CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
-	)
-	cmake-utils_src_configure
-}