stabilization sweep

3 files changed, 1 insertions, 120 deletions

diff --git a/dev-libs/gtkd/Manifest b/dev-libs/gtkd/Manifest
index 609c700..9dbe82c 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.6.6.zip 4386468 BLAKE2B 7a66f3e4dc6b10b4a97da514600223cae75778a9fab4aede0911040e75cb691f3c2b71dd45d3f2016d1c26dd388b9b44380a00d1cc7cc4ce69f88d66f5356953 SHA512 234fd996cbcf7c6f9e1468e4f6847f185523f26572e5570f81b0fde5f2c67e6e6329e7dd075a440489c0510278854d19cf3227ef9334e9bc98fb5c48f28be8f6
 DIST GtkD-3.8.5.zip 4513387 BLAKE2B eb2bf2a5103e14300dee6c3f9abb567b35af272a479c7a4b8dadd4bb480b5aec996a9e54c7fc3a319cbff30bf9dcec71167a05e1440b501b0f91e5ebae79f191 SHA512 efd43a72a514b0b8de9f1db982f2304c264e3a68915da849fe1d6a5c24b8abe2a072526bba3f1c1e3bea81c162de33cd8c570092438c016087d94e875c9a32a5
diff --git a/dev-libs/gtkd/gtkd-3.6.6.ebuild b/dev-libs/gtkd/gtkd-3.6.6.ebuild
deleted file mode 100644
index 4a5fc73..0000000
--- a/dev-libs/gtkd/gtkd-3.6.6.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# 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.068-"
-DLANG_PACKAGE_TYPE="multi"
-
-inherit eutils dlang
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=x11-libs/gtk+-3.22:3[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.52:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.40[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.24[${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.12:1.0[${MULTILIB_USEDEP}] )
-	vte? ( >=x11-libs/vte-0.48: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
-		if dlang_has_shared_lib_support; then
-			dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so \
-				lib${LIB_NAME}-${MAJOR}.so.0 -Isrc -Igenerated/gtkd generated/${SRC_DIR}/*/*.d
-		else
-			ewarn "${DC} does not have shared library support."
-			ewarn "Only static ${LIB_NAME} will be compiled if selected through the static-libs USE flag."
-		fi
-
-		# 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 generated/${SRC_DIR}/*/*.d -lib ${LDFLAGS} ${DLANG_OUTPUT_FLAG}${libname}.a
-			elif [[ "${DLANG_VENDOR}" == "GNU" ]]; then
-				dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Isrc -Igenerated/gtkd generated/${SRC_DIR}/*/*.d -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 generated/${SRC_DIR}/*/*.d -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
-		if dlang_has_shared_lib_support; then
-			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}"
-		fi
-
-		# 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.8.5.ebuild b/dev-libs/gtkd/gtkd-3.8.5.ebuild
index 7da0e92..d6fa278 100644
--- a/dev-libs/gtkd/gtkd-3.8.5.ebuild
+++ b/dev-libs/gtkd/gtkd-3.8.5.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-"