stabilization sweep

Signed-off-by: Marco Leise <marco.leise@gmx.de>

3 files changed, 1 insertions, 121 deletions

diff --git a/dev-libs/gtkd/Manifest b/dev-libs/gtkd/Manifest
index 5161ad5..0834ad3 100644
--- a/dev-libs/gtkd/Manifest
+++ b/dev-libs/gtkd/Manifest
@@ -1,3 +1,2 @@
 DIST GtkD-2.4.2.zip 4190939 BLAKE2B 90a47d0882cb57f94b75a155cb949e4272669764abefcc65b4c0cdece05409e669d87076d094bf8f5f7c342c9be506006f78314341a8291b858d787599a29efa SHA512 2d936c9ab69f8ea6fbd91696c91f04820f579e3cdb85914cda6611ac675dadd0d6e8d792ffced640097797f6851016474fadf964e2fc5032262c0945b875cd46
-DIST GtkD-3.8.5.zip 4513387 BLAKE2B eb2bf2a5103e14300dee6c3f9abb567b35af272a479c7a4b8dadd4bb480b5aec996a9e54c7fc3a319cbff30bf9dcec71167a05e1440b501b0f91e5ebae79f191 SHA512 efd43a72a514b0b8de9f1db982f2304c264e3a68915da849fe1d6a5c24b8abe2a072526bba3f1c1e3bea81c162de33cd8c570092438c016087d94e875c9a32a5
 DIST GtkD-3.9.0.zip 4576099 BLAKE2B 50d0bda16f3026f1c068f7b65049005b86367ee1ced581bb2f941c202e0038f1bc6be350bd4bcb30f69ec0696ae0e7bbf4336546153bda389683d44c87d58eac SHA512 f8b8a7b83a23af990abb77f16e4bddf2f72bb65ad210ff8f138b0d4ff66fb5fb2a73a3cbe868a8d2ecf3abf98ece5af771af63068dc2fbf8668e46039320cf0f
diff --git a/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild b/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild
deleted file mode 100644
index 841f0a9..0000000
--- a/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GtkD is a D binding and OO wrapper of GTK+"
-HOMEPAGE="http://gtkd.org/"
-LICENSE="LGPL-3"
-
-SLOT="3"
-KEYWORDS="amd64 x86"
-SRC_URI="https://gtkd.org/Downloads/sources/GtkD-${PV}.zip"
-
-DLANG_VERSION_RANGE="2.074-"
-DLANG_PACKAGE_TYPE="multi"
-
-inherit eutils dlang
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=x11-libs/gtk+-3.22:3[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.56:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.42[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.28[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.36:2[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.2[${MULTILIB_USEDEP}]
-	sourceview? ( >=x11-libs/gtksourceview-3.24:3.0 )
-	gstreamer? ( >=media-libs/gstreamer-1.14:1.0[${MULTILIB_USEDEP}] )
-	vte? ( >=x11-libs/vte-0.52:2.91 )
-	peas? ( >=dev-libs/libpeas-1.20 )
-"
-
-GTKD_USE_FLAGS=(gtk  opengl sourceview gstreamer  vte  peas)
-GTKD_LIB_NAMES=(gtkd gtkdgl gtkdsv     gstreamerd vted peasd)
-GTKD_SRC_DIRS=( gtkd gtkdgl sourceview gstreamer  vte  peas)
-IUSE="${GTKD_USE_FLAGS[@]:1} static-libs"
-
-MAJOR=$(ver_cut 1)
-MINOR=$(ver_cut 2-)
-
-src_unpack() {
-	unzip -q "${DISTDIR}/${A}" -d "${S}"
-}
-
-d_src_compile() {
-	compile_libs() {
-		# Build the shared library version of the component
-		# The test phase expects no version extension on the .so
-		local sources=generated/${SRC_DIR}/*/*.d
-		if [ ${LIB_NAME} != gtkdgl ]; then
-			sources+=" "generated/${SRC_DIR}/*/c/*.d
-		fi
-		if [ ${LIB_NAME} == gstreamerd ]; then
-			sources+=" "generated/gstreamer/gst/*/*.d" "generated/gstreamer/gst/*/c/*.d
-		fi
-		echo $sources
-		dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so \
-			lib${LIB_NAME}-${MAJOR}.so.0 -Isrc -Igenerated/gtkd ${sources}
-
-		# Build the static library version
-		if use static-libs; then
-			local libname=lib${LIB_NAME}-${MAJOR}
-			if [[ "${DLANG_VENDOR}" == "DigitalMars" ]]; then
-				dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Isrc -Igenerated/gtkd ${sources} -lib ${LDFLAGS} ${DLANG_OUTPUT_FLAG}${libname}.a
-			elif [[ "${DLANG_VENDOR}" == "GNU" ]]; then
-				dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Isrc -Igenerated/gtkd ${sources} -c ${LDFLAGS} ${DLANG_OUTPUT_FLAG}${libname}.o
-				dlang_exec ar rcs ${libname}.a ${libname}.o
-			elif [[ "${DLANG_VENDOR}" == "LDC" ]]; then
-				dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Isrc -Igenerated/gtkd ${sources} -lib -od=${SRC_DIR} -oq ${LDFLAGS} ${DLANG_OUTPUT_FLAG}${libname}.a
-			fi
-		fi
-	}
-
-	foreach_used_component compile_libs
-}
-
-d_src_test() {
-	dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Igenerated/gtkd demos/gtkD/TestWindow/*.d ${DLANG_LINKER_FLAG}./libgtkd-3.so ${DLANG_LINKER_FLAG}-ldl ${DLANG_LINKER_FLAG}-rpath=./ ${LDFLAGS} ${DLANG_OUTPUT_FLAG}TestWindow
-}
-
-d_src_install() {
-	install_libs() {
-		# Install the shared library version of the component
-		local libfile="lib${LIB_NAME}-${MAJOR}.so"
-		ln -sf "${libfile}" "${libfile}.0"
-		ln -sf "${libfile}" "${libfile}.0.${MINOR}"
-		dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}"
-
-		# Install the static library version
-		if use static-libs; then
-			dolib.a "lib${LIB_NAME}-${MAJOR}.a"
-		fi
-	}
-
-	foreach_used_component install_libs
-}
-
-d_src_install_all() {
-	# Obligatory docs
-	dodoc AUTHORS README.md
-
-	# Include files
-	insinto "${DLANG_IMPORT_DIR}/${PN}-${MAJOR}"
-
-	install_headers() {
-		files="generated/${SRC_DIR}/*"
-		doins -r ${files}
-	}
-
-	foreach_used_component install_headers
-}
-
-foreach_used_component() {
-	for (( i = 0 ; i < ${#GTKD_LIB_NAMES[@]} ; i++ )); do
-		if [[ "${GTKD_LIB_NAMES[$i]}" == "gtkd" ]] || use ${GTKD_USE_FLAGS[$i]}; then
-			LIB_NAME=${GTKD_LIB_NAMES[$i]} SRC_DIR=${GTKD_SRC_DIRS[$i]} ${@}
-		fi
-	done
-}
diff --git a/dev-libs/gtkd/gtkd-3.9.0.ebuild b/dev-libs/gtkd/gtkd-3.9.0.ebuild
index 90a9580..425a1de 100644
--- a/dev-libs/gtkd/gtkd-3.9.0.ebuild
+++ b/dev-libs/gtkd/gtkd-3.9.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://gtkd.org/"
 LICENSE="LGPL-3"
 
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="https://gtkd.org/Downloads/sources/GtkD-${PV}.zip"
 
 DLANG_VERSION_RANGE="2.074-"