[gentoo-commits] repo/gentoo:master commit in: eclass/

[Alexis Ballier]

commit:     1347885ac392f72877ea9f144034b72925b2ffc9
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 13:57:05 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 14:01:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1347885a

eclass/texlive-module.eclass: simplify doc useflag handling.

The documentation special case was added for documentation only packages.
Some years ago, upstream merged them into normal packages, so this is now 
useless.

 eclass/texlive-module.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass
index 6cc5cf808f5..88281177477 100644
--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@@ -103,11 +103,11 @@ for i in ${TEXLIVE_MODULE_CONTENTS}; do
 done
 
 # Forge doc SRC_URI
-[ -n "${PN##*documentation*}" ] && [ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && 
SRC_URI="${SRC_URI} doc? ("
+[ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} doc? ("
 for i in ${TEXLIVE_MODULE_DOC_CONTENTS}; do
        SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}"
 done
-[ -n "${PN##*documentation*}" ] && [ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && 
SRC_URI="${SRC_URI} )"
+[ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} )"
 
 # Forge source SRC_URI
 if [ -n "${TEXLIVE_MODULE_SRC_CONTENTS}" ] ; then
@@ -120,7 +120,7 @@ fi
 
 RDEPEND="${COMMON_DEPEND}"
 
-[ -z "${PN##*documentation*}" ] || IUSE="${IUSE} doc"
+IUSE="${IUSE} doc"
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_OPTIONAL_ENGINE
 # @DESCRIPTION:
@@ -347,7 +347,7 @@ texlive-module_src_install() {
        done
 
        dodir /usr/share
-       if [ -z "${PN##*documentation*}" ] || use doc; then
+       if use doc; then
                [ -d texmf-doc ] && cp -pR texmf-doc "${ED}/usr/share/"
        else
                [ -d texmf/doc ] && rm -rf texmf/doc