public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download: 
* [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling
@ 2014-06-18 19:43 99% Sergey Popov
  0 siblings, 0 replies; 1+ results
From: Sergey Popov @ 2014-06-18 19:43 UTC (permalink / raw
  To: gentoo-dev; +Cc: Gentoo Qt herd


[-- Attachment #1.1: Type: text/plain, Size: 241 bytes --]

As we should not do anything crazy with DOCS and HTML_DOCS, let's
simplify our eclass

-- 
Best regards, Sergey Popov
Gentoo developer
Gentoo Desktop-effects project lead
Gentoo Qt project lead
Gentoo Proxy maintainers project lead

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: qt4-r2-eclass-simplify-doc-handling.patch --]
[-- Type: text/x-patch; name="qt4-r2-eclass-simplify-doc-handling.patch", Size: 867 bytes --]

--- qt4-r2.eclass.orig	2014-06-18 23:37:57.867075343 +0400
+++ qt4-r2.eclass	2014-06-18 23:38:35.906075145 +0400
@@ -15,7 +15,7 @@
 	*)	 die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit base qmake-utils
+inherit base eutils qmake-utils
 
 export XDG_CONFIG_HOME="${T}"
 
@@ -132,14 +132,7 @@
 	debug-print-function $FUNCNAME "$@"
 
 	base_src_install INSTALL_ROOT="${D}" "$@"
-
-	# backward compatibility for non-array variables
-	if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		dodoc ${DOCS} || die "dodoc failed"
-	fi
-	if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		dohtml -r ${HTML_DOCS} || die "dohtml failed"
-	fi
+	einstalldocs
 }
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 555 bytes --]

^ permalink raw reply	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2014-06-18 19:43 99% [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling Sergey Popov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox