public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling
@ 2014-06-18 19:43 Sergey Popov
  2014-06-19  1:25 ` hasufell
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
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	[flat|nested] 7+ messages in thread

* Re: [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling
  2014-06-18 19:43 [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling Sergey Popov
@ 2014-06-19  1:25 ` hasufell
  2014-06-19  1:49   ` Jeroen Roovers
  2014-06-19  8:29   ` Sergey Popov
  2014-06-19  2:01 ` Jeroen Roovers
  2014-06-22 18:05 ` [gentoo-dev] " Davide Pesavento
  2 siblings, 2 replies; 7+ messages in thread
From: hasufell @ 2014-06-19  1:25 UTC (permalink / raw
  To: gentoo-dev

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

Just deprecate the whole eclass. I don't see much useful stuff there
except running base.eclass phases and that is already discouraged wrt
#497050. If you remove those parts, not much is left anyway.


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling
  2014-06-19  1:25 ` hasufell
@ 2014-06-19  1:49   ` Jeroen Roovers
  2014-06-19  8:29   ` Sergey Popov
  1 sibling, 0 replies; 7+ messages in thread
From: Jeroen Roovers @ 2014-06-19  1:49 UTC (permalink / raw
  To: gentoo-dev

On Thu, 19 Jun 2014 01:25:03 +0000
hasufell <hasufell@gentoo.org> wrote:

> Sergey Popov:
> > As we should not do anything crazy with DOCS and HTML_DOCS, let's
> > simplify our eclass
> > 
> 
> Just deprecate the whole eclass. I don't see much useful stuff there

You have got to be kidding.


     jer


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling
  2014-06-18 19:43 [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling Sergey Popov
  2014-06-19  1:25 ` hasufell
@ 2014-06-19  2:01 ` Jeroen Roovers
  2014-06-23  8:50   ` Sergey Popov
  2014-06-22 18:05 ` [gentoo-dev] " Davide Pesavento
  2 siblings, 1 reply; 7+ messages in thread
From: Jeroen Roovers @ 2014-06-19  2:01 UTC (permalink / raw
  To: gentoo-dev

On Wed, 18 Jun 2014 23:43:34 +0400
Sergey Popov <pinkbyte@gentoo.org> wrote:

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

Looks good. What ebuilds would be affected (i.e. simplifying them)?


     jer


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling
  2014-06-19  1:25 ` hasufell
  2014-06-19  1:49   ` Jeroen Roovers
@ 2014-06-19  8:29   ` Sergey Popov
  1 sibling, 0 replies; 7+ messages in thread
From: Sergey Popov @ 2014-06-19  8:29 UTC (permalink / raw
  To: gentoo-dev; +Cc: hasufell

[-- Attachment #1: Type: text/plain, Size: 698 bytes --]

19.06.2014 05:25, hasufell пишет:
> Sergey Popov:
>> As we should not do anything crazy with DOCS and HTML_DOCS, let's
>> simplify our eclass
>>
> 
> Just deprecate the whole eclass. I don't see much useful stuff there
> except running base.eclass phases and that is already discouraged wrt
> #497050. If you remove those parts, not much is left anyway.
> 

We are planning to get rid of base eclass, but we are not planning to
change all of our ebuilds to utilize qmake-utils eclass manually,
thanks, but would not happen.

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


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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-dev] Re: [PATCH] qt4-r2.eclass: simplify doc handling
  2014-06-18 19:43 [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling Sergey Popov
  2014-06-19  1:25 ` hasufell
  2014-06-19  2:01 ` Jeroen Roovers
@ 2014-06-22 18:05 ` Davide Pesavento
  2 siblings, 0 replies; 7+ messages in thread
From: Davide Pesavento @ 2014-06-22 18:05 UTC (permalink / raw
  To: Sergey Popov; +Cc: gentoo-dev, Gentoo Qt herd

On Wed, Jun 18, 2014 at 12:43 PM, Sergey Popov <pinkbyte@gentoo.org> wrote:
> As we should not do anything crazy with DOCS and HTML_DOCS, let's
> simplify our eclass
>

It's not about doing "anything crazy"... einstalldocs simply didn't
exist at the time.

Anyway, ACK from me. And please remember to update the qt overlay too.

Thanks,
Davide


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling
  2014-06-19  2:01 ` Jeroen Roovers
@ 2014-06-23  8:50   ` Sergey Popov
  0 siblings, 0 replies; 7+ messages in thread
From: Sergey Popov @ 2014-06-23  8:50 UTC (permalink / raw
  To: gentoo-dev, Gentoo Qt herd

[-- Attachment #1: Type: text/plain, Size: 766 bytes --]

19.06.2014 06:01, Jeroen Roovers пишет:
> On Wed, 18 Jun 2014 23:43:34 +0400
> Sergey Popov <pinkbyte@gentoo.org> wrote:
> 
>> As we should not do anything crazy with DOCS and HTML_DOCS, let's
>> simplify our eclass
> 
> Looks good. What ebuilds would be affected (i.e. simplifying them)?

Behaviour could be changed for 225 ebuilds in main tree, according my
grep/sed/awk thingie :-)

Old code snippet did not do anything if DOCS and HTML_DOCS are not
installed.

einstalldocs would install default set of files(README, ChangeLog, etc).

Anyway, i will commit this change in a moment...

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


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

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-06-23  8:52 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-18 19:43 [gentoo-dev] [PATCH] qt4-r2.eclass: simplify doc handling Sergey Popov
2014-06-19  1:25 ` hasufell
2014-06-19  1:49   ` Jeroen Roovers
2014-06-19  8:29   ` Sergey Popov
2014-06-19  2:01 ` Jeroen Roovers
2014-06-23  8:50   ` Sergey Popov
2014-06-22 18:05 ` [gentoo-dev] " Davide Pesavento

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