1 |
commit: 2259d3e1f1cb0477ec8aa30d595dd895d8e977dc |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 28 08:29:17 2012 +0000 |
4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 08:30:23 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2259d3e1 |
7 |
|
8 |
gnome-extra/gtkhtml: 4.5.5 → 4.6.0 and add live ebuild |
9 |
|
10 |
--- |
11 |
.../{gtkhtml-4.5.5.ebuild => gtkhtml-4.6.0.ebuild} | 19 +++++++++++++------ |
12 |
.../{gtkhtml-4.5.5.ebuild => gtkhtml-9999.ebuild} | 19 +++++++++++++------ |
13 |
2 files changed, 26 insertions(+), 12 deletions(-) |
14 |
|
15 |
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.6.0.ebuild |
16 |
similarity index 72% |
17 |
copy from gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild |
18 |
copy to gnome-extra/gtkhtml/gtkhtml-4.6.0.ebuild |
19 |
index 314c69b..9735a4b 100644 |
20 |
--- a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild |
21 |
+++ b/gnome-extra/gtkhtml/gtkhtml-4.6.0.ebuild |
22 |
@@ -1,19 +1,24 @@ |
23 |
# Copyright 1999-2012 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild,v 1.1 2012/06/23 09:46:13 pacho Exp $ |
26 |
+# $Header: $ |
27 |
|
28 |
EAPI="4" |
29 |
GCONF_DEBUG="no" |
30 |
GNOME2_LA_PUNT="yes" |
31 |
|
32 |
-inherit gnome2 eutils |
33 |
+inherit gnome2 |
34 |
+[[ ${PV} = 9999 ]] && inherit gnome2-live |
35 |
|
36 |
DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine" |
37 |
HOMEPAGE="http://www.gnome.org/" |
38 |
|
39 |
-LICENSE="GPL-2 LGPL-2" |
40 |
+LICENSE="GPL-2+ LGPL-2+" |
41 |
SLOT="4.0" |
42 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" |
43 |
+if [[ ${PV} = 9999 ]]; then |
44 |
+ KEYWORDS="" |
45 |
+else |
46 |
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" |
47 |
+fi |
48 |
IUSE="" |
49 |
|
50 |
# orbit is referenced in configure, but is not used anywhere else |
51 |
@@ -40,8 +45,10 @@ pkg_setup() { |
52 |
|
53 |
src_prepare() { |
54 |
# Regenerate marshallers for <glib-2.31 compatibility |
55 |
- rm -v components/editor/gtkhtml-spell-marshal.{c,h} \ |
56 |
- components/editor/gtkhtml-editor-marshal.{c,h} || die |
57 |
+ if [[ ${PV} != 9999 ]]; then |
58 |
+ rm -v components/editor/gtkhtml-spell-marshal.{c,h} \ |
59 |
+ components/editor/gtkhtml-editor-marshal.{c,h} || die |
60 |
+ fi |
61 |
gnome2_src_prepare |
62 |
} |
63 |
|
64 |
|
65 |
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild |
66 |
similarity index 72% |
67 |
rename from gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild |
68 |
rename to gnome-extra/gtkhtml/gtkhtml-9999.ebuild |
69 |
index 314c69b..9735a4b 100644 |
70 |
--- a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild |
71 |
+++ b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild |
72 |
@@ -1,19 +1,24 @@ |
73 |
# Copyright 1999-2012 Gentoo Foundation |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild,v 1.1 2012/06/23 09:46:13 pacho Exp $ |
76 |
+# $Header: $ |
77 |
|
78 |
EAPI="4" |
79 |
GCONF_DEBUG="no" |
80 |
GNOME2_LA_PUNT="yes" |
81 |
|
82 |
-inherit gnome2 eutils |
83 |
+inherit gnome2 |
84 |
+[[ ${PV} = 9999 ]] && inherit gnome2-live |
85 |
|
86 |
DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine" |
87 |
HOMEPAGE="http://www.gnome.org/" |
88 |
|
89 |
-LICENSE="GPL-2 LGPL-2" |
90 |
+LICENSE="GPL-2+ LGPL-2+" |
91 |
SLOT="4.0" |
92 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" |
93 |
+if [[ ${PV} = 9999 ]]; then |
94 |
+ KEYWORDS="" |
95 |
+else |
96 |
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" |
97 |
+fi |
98 |
IUSE="" |
99 |
|
100 |
# orbit is referenced in configure, but is not used anywhere else |
101 |
@@ -40,8 +45,10 @@ pkg_setup() { |
102 |
|
103 |
src_prepare() { |
104 |
# Regenerate marshallers for <glib-2.31 compatibility |
105 |
- rm -v components/editor/gtkhtml-spell-marshal.{c,h} \ |
106 |
- components/editor/gtkhtml-editor-marshal.{c,h} || die |
107 |
+ if [[ ${PV} != 9999 ]]; then |
108 |
+ rm -v components/editor/gtkhtml-spell-marshal.{c,h} \ |
109 |
+ components/editor/gtkhtml-editor-marshal.{c,h} || die |
110 |
+ fi |
111 |
gnome2_src_prepare |
112 |
} |