[gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass - gentoo-commits

From:	"Andreas HAttel (dilfridge)" <dilfridge@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
Date:	Mon, 03 Jan 2011 20:36:27
Message-Id:	`20110103203617.D1C4720057@flycatcher.gentoo.org`

1

dilfridge    11/01/03 20:36:17

2

3

  Modified:             kde4-base.eclass kde4-functions.eclass

4

  Log:

5

  Add RDEPEND on oxygen-icons to all ebuilds using kde4-base.eclass. Ack'ed by tampakrap.

6

7

Revision  Changes    Path

8

1.82                 eclass/kde4-base.eclass

9

10

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.82&view=markup

11

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.82&content-type=text/plain

12

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.81&r2=1.82

13

14

Index: kde4-base.eclass

15

===================================================================

16

RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v

17

retrieving revision 1.81

18

retrieving revision 1.82

19

diff -u -r1.81 -r1.82

20

--- kde4-base.eclass	29 Dec 2010 17:06:51 -0000	1.81

21

+++ kde4-base.eclass	3 Jan 2011 20:36:17 -0000	1.82

22

@@ -1,6 +1,6 @@

23

 # Copyright 1999-2010 Gentoo Foundation

24

 # Distributed under the terms of the GNU General Public License v2

25

-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.81 2010/12/29 17:06:51 tampakrap Exp $

26

+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.82 2011/01/03 20:36:17 dilfridge Exp $

27

28

 # @ECLASS: kde4-base.eclass

29

 # @MAINTAINER:

30

@@ -379,6 +379,10 @@

31

"

32

 kderdepend=""

33

34

+if [[ ${PN} != oxygen-icons ]]; then

35

+	kderdepend+=" $(add_kdebase_dep oxygen-icons)"

36

+fi

37

+

38

 kdehandbookdepend="

39

 	app-text/docbook-xml-dtd:4.2

40

 	app-text/docbook-xsl-stylesheets

1.42                 eclass/kde4-functions.eclass

45

46

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.42&view=markup

47

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.42&content-type=text/plain

48

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.41&r2=1.42

49

50

Index: kde4-functions.eclass

51

===================================================================

52

RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v

53

retrieving revision 1.41

54

retrieving revision 1.42

55

diff -u -r1.41 -r1.42

56

--- kde4-functions.eclass	29 Dec 2010 17:56:34 -0000	1.41

57

+++ kde4-functions.eclass	3 Jan 2011 20:36:17 -0000	1.42

58

@@ -1,6 +1,6 @@

59

 # Copyright 1999-2010 Gentoo Foundation

60

 # Distributed under the terms of the GNU General Public License v2

61

-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $

62

+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.42 2011/01/03 20:36:17 dilfridge Exp $

63

64

 inherit versionator

65

66

@@ -376,10 +376,10 @@

67

 	if [[ ${KDEBASE} = kde-base ]]; then

68

 		# FIXME remove hack when >kdepim-4.4.5 is gone

69

 		local FIXME_PV

70

-		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7*  || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then

71

+		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7*  || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then

72

 			FIXME_PV=4.4.5

73

 		# FIXME remove hack when kdepim-4.6beta is gone

74

-		elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then

75

+		elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then

76

 			FIXME_PV=4.5.90

77

 		else

78

 			FIXME_PV=${PV}

1	dilfridge 11/01/03 20:36:17
2
3	Modified: kde4-base.eclass kde4-functions.eclass
4	Log:
5	Add RDEPEND on oxygen-icons to all ebuilds using kde4-base.eclass. Ack'ed by tampakrap.
6
7	Revision Changes Path
8	1.82 eclass/kde4-base.eclass
9
10	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.82&view=markup
11	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.82&content-type=text/plain
12	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.81&r2=1.82
13
14	Index: kde4-base.eclass
15	===================================================================
16	RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
17	retrieving revision 1.81
18	retrieving revision 1.82
19	diff -u -r1.81 -r1.82
20	--- kde4-base.eclass 29 Dec 2010 17:06:51 -0000 1.81
21	+++ kde4-base.eclass 3 Jan 2011 20:36:17 -0000 1.82
22	@@ -1,6 +1,6 @@
23	# Copyright 1999-2010 Gentoo Foundation
24	# Distributed under the terms of the GNU General Public License v2
25	-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.81 2010/12/29 17:06:51 tampakrap Exp $
26	+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.82 2011/01/03 20:36:17 dilfridge Exp $
27
28	# @ECLASS: kde4-base.eclass
29	# @MAINTAINER:
30	@@ -379,6 +379,10 @@
31	"
32	kderdepend=""
33
34	+if [[ ${PN} != oxygen-icons ]]; then
35	+ kderdepend+=" $(add_kdebase_dep oxygen-icons)"
36	+fi
37	+
38	kdehandbookdepend="
39	app-text/docbook-xml-dtd:4.2
40	app-text/docbook-xsl-stylesheets
41
42
43
44	1.42 eclass/kde4-functions.eclass
45
46	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.42&view=markup
47	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.42&content-type=text/plain
48	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.41&r2=1.42
49
50	Index: kde4-functions.eclass
51	===================================================================
52	RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
53	retrieving revision 1.41
54	retrieving revision 1.42
55	diff -u -r1.41 -r1.42
56	--- kde4-functions.eclass 29 Dec 2010 17:56:34 -0000 1.41
57	+++ kde4-functions.eclass 3 Jan 2011 20:36:17 -0000 1.42
58	@@ -1,6 +1,6 @@
59	# Copyright 1999-2010 Gentoo Foundation
60	# Distributed under the terms of the GNU General Public License v2
61	-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $
62	+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.42 2011/01/03 20:36:17 dilfridge Exp $
63
64	inherit versionator
65
66	@@ -376,10 +376,10 @@
67	if [[ ${KDEBASE} = kde-base ]]; then
68	# FIXME remove hack when >kdepim-4.4.5 is gone
69	local FIXME_PV
70	- if [[ ${KMNAME} = kdepim \|\| ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* \|\| ${PV} = 4.4.7* \|\| ${PV} = 4.4.8* \|\| ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs \|\| ${1} = kdepimlibs ]]; then
71	+ if [[ ${KMNAME} = kdepim \|\| ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* \|\| ${PV} = 4.4.7* \|\| ${PV} = 4.4.8* \|\| ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs \|\| ${1} = kdepimlibs \|\| ${1} = oxygen-icons ]]; then
72	FIXME_PV=4.4.5
73	# FIXME remove hack when kdepim-4.6beta is gone
74	- elif [[ ${KMNAME} = kdepim \|\| ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs \|\| ${1} = kdepimlibs ]]; then
75	+ elif [[ ${KMNAME} = kdepim \|\| ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs \|\| ${1} = kdepimlibs \|\| ${1} = oxygen-icons ]]; then
76	FIXME_PV=4.5.90
77	else
78	FIXME_PV=${PV}

Gentoo Archives: gentoo-commits