From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1AF301382C5 for ; Mon, 30 Nov 2020 02:19:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24EC5E0880; Mon, 30 Nov 2020 02:19:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFF20E0880 for ; Mon, 30 Nov 2020 02:19:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F5433415BE for ; Mon, 30 Nov 2020 02:19:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3CB9486 for ; Mon, 30 Nov 2020 02:19:27 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1606702758.942b00d6540855fb49858f2d983ce5c6b5535b14.asturm@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: eclass/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: eclass/poppler.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 942b00d6540855fb49858f2d983ce5c6b5535b14 X-VCS-Branch: master Date: Mon, 30 Nov 2020 02:19:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6cf0b7d3-fa4f-4a5f-a512-a96622119149 X-Archives-Hash: f0b42bc5b5c4c0d8e3ab229ed092ef6a commit: 942b00d6540855fb49858f2d983ce5c6b5535b14 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 30 02:15:31 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 30 02:19:18 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=942b00d6 poppler.eclass: Remove unused eclass Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/poppler.eclass | 197 -------------------------------------------------- 1 file changed, 197 deletions(-) diff --git a/eclass/poppler.eclass b/eclass/poppler.eclass deleted file mode 100644 index 5ca760e1..00000000 --- a/eclass/poppler.eclass +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/poppler.eclass,v 1.6 2010/01/03 19:10:49 scarabeus Exp $ - -# @ECLASS: poppler.eclass -# @MAINTAINER: -# Peter Alfredsen -# @BLURB: Reduces code duplication in the modularized poppler ebuilds. -# @DESCRIPTION: -# Provides an easy template for making modularized poppler-based ebuilds. - -inherit base multilib libtool - -has 2 ${EAPI} || DEPEND="EAPI-TOO-OLD" - -EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install - -RDEPEND=" - !app-text/poppler - !app-text/poppler-bindings - " -DEPEND=" - virtual/pkgconfig - userland_GNU? ( >=sys-apps/findutils-4.4.0 ) - " - - -# @ECLASS-VARIABLE: HOMEPAGE -# @DESCRIPTION: -# Default HOMEPAGE -HOMEPAGE="http://poppler.freedesktop.org/" - -# @ECLASS-VARIABLE: SRC_URI -# @DESCRIPTION: -# Default SRC_URI -SRC_URI="http://poppler.freedesktop.org/poppler-${PV}.tar.gz" - -# @ECLASS-VARIABLE: S -# @DESCRIPTION: -# Default working directory -S=${WORKDIR}/poppler-${PV} - -# @ECLASS-VARIABLE: POPPLER_MODULE -# @DESCRIPTION: -# The name of the poppler module. Must be set by the ebuild before inheriting -# the poppler eclass. -POPPLER_MODULE=${POPPLER_MODULE} - -# @ECLASS-VARIABLE: POPPLER_MODULE_S -# @DESCRIPTION: -# The working directory of the poppler module. -POPPLER_MODULE_S=${S}/${POPPLER_MODULE} - -# @FUNCTION: pkg_check_modules_override -# @USAGE: [package1] [package2] -# @DESCRIPTION: -# Will export the appropriate variables to override PKG_CHECK_MODULES autoconf -# macros, with the string " " by default. If packages are specified, they will -# be looked up with pkg-config and the appropriate LIBS and CFLAGS substituted. -# LIBS and CFLAGS can also be specified per-package with the following syntax: -# @CODE -# package=LIBS%CFLAGS -# @CODE -# = and % have no effect unless both are specified. -# Here is an example: -# @CODE -# pkg_check_modules_override GASH "gtk+-2.0=-jule%" gobject-2.0 -# @CODE -# The above example will do: -# @CODE -# export GASH_CFLAGS+=" -jule" -# export GASH_LIBS+=" " -# export GASH_CFLAGS+=" $(pkg-config --cflags gobject-2.0)" -# export GASH_LIBS+=" $(pkg-config --libs gobject-2.0)" -# @CODE -# -# NOTE: If a package is not found, the string " " will be inserted in place of -# _CFLAGS and _LIBS -pkg_check_modules_override() { - local package - local group="${1}" - local packages="${*:2}" - export ${group}_CFLAGS=" " - export ${group}_LIBS=" " - - if [[ ${#@} -lt 1 ]] - then - eerror "${FUNCNAME[0]} requires at least one parameter: GROUP" - eerror "PKG_CHECK_MODULES(GROUP, package1 package2 etc)" - die "${FUNCNAME[0]} requires at least one parameter: GROUP" - fi - - for package in $packages - do - if [[ ${package/=} != ${package} && ${package/\%} != ${package} ]] - then - package_cflag_libs=${package##*=} - export ${group}_CFLAGS+=" ${package_cflag_libs%%\%*}" - export ${group}_LIBS+=" ${package_cflag_libs##*\%}" - else - if pkg-config --exists $package - then - export ${group}_CFLAGS+=" $(pkg-config --cflags $package)" - export ${group}_LIBS+=" $(pkg-config --libs $package)" - else - export ${group}_CFLAGS+=" " - export ${group}_LIBS+=" " - fi - fi - done -} -# @FUNCTION: poppler_src_unpack -# @USAGE: -# @DESCRIPTION: -# Runs unpack ${A} -poppler_src_unpack() { - unpack ${A} -} - -# @FUNCTION: poppler_src_prepare -# @USAGE: -# @DESCRIPTION: -# Runs autopatch from base.eclass. -# Uses sed to replace libpoppler.la references with -lpoppler -poppler_src_prepare() { - base_src_prepare - sed -i \ - -e 's#$(top_builddir)/poppler/libpoppler.la#-lpoppler#' \ - $(find . -type f -name 'Makefile.in') || die "Failed to sed proper lib into Makefile.am" - elibtoolize -} - -# @FUNCTION: poppler_src_configure -# @USAGE: -# @DESCRIPTION: -# Makes sure we get a uniform Makefile environment by using pkg_check_modules_override to -# fill out some blanks that configure wants filled. Probably not really needed, but -# insures against future breakage. -# Calls econf with some defaults. -poppler_src_configure() { - pkg_check_modules_override CAIRO cairo - pkg_check_modules_override POPPLER_GLIB glib-2.0 - pkg_check_modules_override POPPLER_QT4 QtCore QtGui QtXml - pkg_check_modules_override POPPLER_QT4_TEST QtTest - pkg_check_modules_override ABIWORD libxml-2.0 - pkg_check_modules_override GTK_TEST gtk+-2.0 gdk-pixbuf-2.0 libglade-2.0 gthread-2.0 - pkg_check_modules_override POPPLER_GLIB glib-2.0 gobject-2.0 - - econf --disable-static \ - --enable-poppler-qt4 \ - --enable-poppler-glib \ - --enable-xpdf-headers \ - --enable-libjpeg \ - --enable-libopenjpeg \ - --enable-zlib \ - --enable-splash-output \ - ${POPPLER_CONF} -} - -# @FUNCTION: poppler_src_compile -# @USAGE: -# @DESCRIPTION: -# Removes top_srcdir Makefile to ensure that no accidental recursion happens. The build -# will just die if it tries to go through top_srcdir. -# Runs emake "$@" in POPPLER_MODULE_S -poppler_src_compile() { - rm -f "${S}"/Makefile* &> /dev/null - cd "${POPPLER_MODULE_S}" || die "POPPLER_MODULE_S=${POPPLER_MODULE_S} - cd failed" - einfo "Now in $POPPLER_MODULE_S" - emake "$@" || die "emake failed" -} - -# @FUNCTION: poppler_src_install -# @USAGE: -# @DESCRIPTION: -# Runs emake DESTDIR="${D}" ${@:-install} in POPPLER_MODULE_S -# Removes .la files. -poppler_src_install() { - cd "${POPPLER_MODULE_S}" - emake DESTDIR="${D}" ${@:-install} || die "make install failed" - for pfile in "${POPPLER_PKGCONFIG[@]}" - do - insinto /usr/$(get_libdir)/pkgconfig - if [[ ${pfile/=} != ${pfile} ]] - then - if use ${pfile%=*} - then - pfile=${pfile#*=} - else - pfile=false - fi - fi - [[ ${pfile} != "false" ]] && doins "${S}/${pfile}" - done - - find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" -}