[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-libs/libsolv/

[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-libs/libsolv/

[Michał Górny]

commit:     eae487b22f4fd2030be2b8f893a129794c40afc7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  4 16:55:34 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec  4 16:55:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae487b2

dev-libs/libsolv: Remove last-rited pkg

Closes: https://bugs.gentoo.org/587866
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/libsolv/Manifest              |   1 -
 dev-libs/libsolv/libsolv-0.6.22.ebuild | 103 ---------------------------------
 dev-libs/libsolv/metadata.xml          |  11 ----
 profiles/package.mask                  |   5 --
 4 files changed, 120 deletions(-)

diff --git a/dev-libs/libsolv/Manifest b/dev-libs/libsolv/Manifest
deleted file mode 100644
index 4116abe97d0..00000000000
--- a/dev-libs/libsolv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libsolv-0.6.22.tar.gz 609489 BLAKE2B 985a80a4f45bedac310c76fe3557064b7c42fdcab5fb753109c12503084938f0fe72903fd2faa01fd8978015269522b8512cf4a08d95bec82be61f766264c887 SHA512 9f5a3fd7c8716a7313c8205edd9906973577f63340667674a5cbba29991bb159d9d1e2444bcd09debadbb23dc2a8e8f2b44a1575685dbb1031b5920c5eb6cbc1

diff --git a/dev-libs/libsolv/libsolv-0.6.22.ebuild b/dev-libs/libsolv/libsolv-0.6.22.ebuild
deleted file mode 100644
index 4c701eeb131..00000000000
--- a/dev-libs/libsolv/libsolv-0.6.22.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-USE_RUBY=( ruby23 )
-RUBY_OPTIONAL=yes
-
-inherit cmake-utils python-r1 ruby-ng perl-module multilib
-
-DESCRIPTION="Library for solving packages and reading repositories"
-HOMEPAGE="https://doc.opensuse.org/projects/libzypp/HEAD/ https://github.com/openSUSE/libsolv"
-SRC_URI="https://github.com/openSUSE/libsolv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bzip2 lzma perl python rpm ruby tcl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/expat
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rpm? ( app-arch/rpm )
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig:0 )
-	python? ( dev-lang/swig:0 )
-	ruby? ( dev-lang/swig:0 )
-	tcl? ( dev-lang/swig:0 )
-	sys-devel/gettext"
-
-# The ruby-ng eclass is stupid and breaks this for no good reason.
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	use perl && perl_set_version
-	use ruby && ruby-ng_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The python bindings are tightly integrated w/cmake.
-	sed -i \
-		-e 's: libsolv: -lsolv:g' \
-		bindings/python/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_VENDORDIRS=1
-		-DLIB="$(get_libdir)"
-		-DENABLE_PYTHON=0
-		$(cmake-utils_use_enable bzip2 BZIP2_COMPRESSION)
-		$(cmake-utils_use_enable lzma LZMA_COMPRESSION)
-		$(cmake-utils_use_enable perl PERL)
-		$(cmake-utils_use_enable rpm RPMDB)
-		$(cmake-utils_use_enable rpm RPMMD)
-		$(cmake-utils_use_enable ruby RUBY)
-		$(cmake-utils_use_enable tcl TCL)
-	)
-
-	cmake-utils_src_configure
-
-	if use python ; then
-		# python_foreach_impl will create a unique BUILD_DIR for
-		# us to run inside of, so no need to manage it ourselves.
-		mycmakeargs+=(
-			# Rework the bindings for a minor configure speedup.
-			-DENABLE_PYTHON=1
-			-DENABLE_{PERL,RUBY,TCL}=0
-		)
-		# Link against the common library so the bindings don't
-		# have to rebuild it.
-		LDFLAGS="-L${BUILD_DIR}/src ${LDFLAGS}" \
-		python_foreach_impl cmake-utils_src_configure
-	fi
-}
-
-pysolv_phase_func() {
-	BUILD_DIR="${BUILD_DIR}/bindings/python" \
-	cmake-utils_${EBUILD_PHASE_FUNC}
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use python && python_foreach_impl pysolv_phase_func
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use python && python_foreach_impl pysolv_phase_func
-	use perl && perl_delete_localpod
-}

diff --git a/dev-libs/libsolv/metadata.xml b/dev-libs/libsolv/metadata.xml
deleted file mode 100644
index 801f1aa5c29..00000000000
--- a/dev-libs/libsolv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="rpm">Enable support for RPM files</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">openSUSE/libsolv</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 3b4ddc80c63..5f3a2ac8df3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -364,11 +364,6 @@ www-client/dooble
 # Removal in a month.
 media-gfx/replicatorg
 
-# Pacho Ramos <pacho@gentoo.org> (04 Nov 2018)
-# Build issues (#587866), outdated, nothing needs it in the tree. Removal in
-# a month.
-dev-libs/libsolv
-
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Nov 2018)
 # Breaks revdeps (GDir and GDirEntry split from gfile.h into new gdir.h)
 # See tracker: https://bugs.gentoo.org/670222