1 |
commit: 31e7f4e94c89c778b2124e9b8e82d6064de1c55b |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 29 07:42:00 2011 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 29 07:42:00 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=31e7f4e9 |
7 |
|
8 |
Version BUmp, Fixed all QA issues |
9 |
|
10 |
(Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit with key 70EB7916) |
11 |
|
12 |
--- |
13 |
app-doc/yodl/ChangeLog | 10 ++++ |
14 |
app-doc/yodl/files/yodl-3.00.0-ldflags.patch | 52 ++++++++++++++++++++ |
15 |
app-doc/yodl/metadata.xml | 6 ++ |
16 |
.../{yodl-2.15.2.ebuild => yodl-3.00.0.ebuild} | 33 +++++++++--- |
17 |
4 files changed, 92 insertions(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/app-doc/yodl/ChangeLog b/app-doc/yodl/ChangeLog |
20 |
new file mode 100644 |
21 |
index 0000000..63354f3 |
22 |
--- /dev/null |
23 |
+++ b/app-doc/yodl/ChangeLog |
24 |
@@ -0,0 +1,10 @@ |
25 |
+# ChangeLog for app-doc/yodl |
26 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
+# $Header: $ |
28 |
+ |
29 |
+*yodl-3.00.0 (29 Apr 2011) |
30 |
+ |
31 |
+ 29 Apr 2011; Justin Lecher <jlec@g.o> -yodl-2.15.2.ebuild, |
32 |
+ +yodl-3.00.0.ebuild, +files/yodl-3.00.0-ldflags.patch, +metadata.xml: |
33 |
+ Version BUmp, Fixed all QA issues |
34 |
+ |
35 |
|
36 |
diff --git a/app-doc/yodl/files/yodl-3.00.0-ldflags.patch b/app-doc/yodl/files/yodl-3.00.0-ldflags.patch |
37 |
new file mode 100644 |
38 |
index 0000000..4d31204 |
39 |
--- /dev/null |
40 |
+++ b/app-doc/yodl/files/yodl-3.00.0-ldflags.patch |
41 |
@@ -0,0 +1,52 @@ |
42 |
+ INSTALL.im | 4 +++- |
43 |
+ icmake/program | 2 +- |
44 |
+ icmake/stdcompile | 2 +- |
45 |
+ 3 files changed, 5 insertions(+), 3 deletions(-) |
46 |
+ |
47 |
+diff --git a/INSTALL.im b/INSTALL.im |
48 |
+index 369885d..4b7532f 100644 |
49 |
+--- a/INSTALL.im |
50 |
++++ b/INSTALL.im |
51 |
+@@ -56,6 +56,8 @@ string COMPILER; |
52 |
+ // used with the gprof profiler. When specified, no stripping is performed |
53 |
+ // at ./build program strip (see INSTALL) |
54 |
+ |
55 |
++string LDFLAGS; |
56 |
++ |
57 |
+ void setLocations() |
58 |
+ { |
59 |
+ BASE = "/usr"; |
60 |
+@@ -65,7 +67,7 @@ void setLocations() |
61 |
+ MAN = BASE + "/share/man"; |
62 |
+ DOC = BASE + "/share/doc/yodl"; |
63 |
+ DOCDOC = BASE + "/share/doc/yodl-doc"; |
64 |
+- |
65 |
++ LDFLAGS = "GENTOOLDFLAGS"; |
66 |
+ COMPILER = "gcc"; |
67 |
+ // COMPILER = "gcc-4.5"; |
68 |
+ } |
69 |
+diff --git a/icmake/program b/icmake/program |
70 |
+index 70e7e10..81f873c 100644 |
71 |
+--- a/icmake/program |
72 |
++++ b/icmake/program |
73 |
+@@ -17,7 +17,7 @@ void programYodlpost() |
74 |
+ |
75 |
+ void programYodlverbinsert() |
76 |
+ { |
77 |
+- run(COMPILER + " -o " + g_install + BIN + "/yodlverbinsert " + g_copt + |
78 |
++ run(COMPILER + " " + LDFLAGS + " -o " + g_install + BIN + "/yodlverbinsert " + g_copt + |
79 |
+ " src/verbinsert/verbinsert.c " + g_lopt); |
80 |
+ } |
81 |
+ |
82 |
+diff --git a/icmake/stdcompile b/icmake/stdcompile |
83 |
+index 57f0b99..7e011cd 100644 |
84 |
+--- a/icmake/stdcompile |
85 |
++++ b/icmake/stdcompile |
86 |
+@@ -1,6 +1,6 @@ |
87 |
+ void link(string program) |
88 |
+ { |
89 |
+- exec(COMPILER, "-o", g_install + BIN + "/" + program, |
90 |
++ exec(COMPILER, LDFLAGS, "-o", g_install + BIN + "/" + program, |
91 |
+ g_wip + program + "/*.o", |
92 |
+ "-L" + g_wip, "-lyodl", g_lopt); |
93 |
+ } |
94 |
|
95 |
diff --git a/app-doc/yodl/metadata.xml b/app-doc/yodl/metadata.xml |
96 |
new file mode 100644 |
97 |
index 0000000..e6233b5 |
98 |
--- /dev/null |
99 |
+++ b/app-doc/yodl/metadata.xml |
100 |
@@ -0,0 +1,6 @@ |
101 |
+<?xml version="1.0" encoding="UTF-8"?> |
102 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
103 |
+<pkgmetadata> |
104 |
+<herd>no-herd</herd> |
105 |
+<maintainer><email>maintainer-wanted@g.o</email></maintainer> |
106 |
+</pkgmetadata> |
107 |
|
108 |
diff --git a/app-doc/yodl/yodl-2.15.2.ebuild b/app-doc/yodl/yodl-3.00.0.ebuild |
109 |
similarity index 52% |
110 |
rename from app-doc/yodl/yodl-2.15.2.ebuild |
111 |
rename to app-doc/yodl/yodl-3.00.0.ebuild |
112 |
index 95af8a9..5d3197d 100644 |
113 |
--- a/app-doc/yodl/yodl-2.15.2.ebuild |
114 |
+++ b/app-doc/yodl/yodl-3.00.0.ebuild |
115 |
@@ -1,8 +1,10 @@ |
116 |
-# Copyright 1999-2010 Gentoo Foundation |
117 |
+# Copyright 1999-2011 Gentoo Foundation |
118 |
# Distributed under the terms of the GNU General Public License v2 |
119 |
# $Header: $ |
120 |
|
121 |
-EAPI="2" |
122 |
+EAPI="4" |
123 |
+ |
124 |
+inherit eutils toolchain-funcs |
125 |
|
126 |
DESCRIPTION="Tools to process files written in Your Own Document Language (Yodl)" |
127 |
HOMEPAGE="http://yodl.sourceforge.net/" |
128 |
@@ -11,29 +13,42 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${PN}_${PV}.orig.tar.gz" |
129 |
LICENSE="GPL-3" |
130 |
SLOT="0" |
131 |
KEYWORDS="~amd64 ~x86" |
132 |
-IUSE="" |
133 |
+IUSE="doc" |
134 |
|
135 |
-DEPEND="dev-util/icmake |
136 |
+DEPEND=" |
137 |
+ dev-util/icmake |
138 |
dev-texlive/texlive-latex" |
139 |
RDEPEND="" |
140 |
|
141 |
src_prepare() { |
142 |
+ epatch "${FILESDIR}"/${P}-ldflags.patch |
143 |
sed 's|^#define COPT .\+$|#define COPT "'"${CXXFLAGS}"'"|' -i build \ |
144 |
|| die 'sed failed (file missing)' |
145 |
+ sed \ |
146 |
+ -e "s:GENTOOLDFLAGS:${LDFLAGS}:g" \ |
147 |
+ -e "s:/usr:${EPREFIX}/usr:g" \ |
148 |
+ -e "s:/share/doc/yodl:/share/doc/${PF}:g" \ |
149 |
+ -e "s:/share/doc/yodl-doc:/share/doc/${PN}:g" \ |
150 |
+ -e "/COMPILER/s:\"gcc\":\"$(tc-getCC)\":g" \ |
151 |
+ -i INSTALL.im || die |
152 |
} |
153 |
|
154 |
src_compile() { |
155 |
addpredict /var/cache/fonts # TODO proper fix |
156 |
./build programs || die './build programs' |
157 |
./build man || die './build man' |
158 |
- ./build manual || die './build manual' |
159 |
- ./build macros || die './build macros' |
160 |
+ if use doc; then |
161 |
+ ./build manual || die './build manual' |
162 |
+ ./build macros || die './build macros' |
163 |
+ fi |
164 |
} |
165 |
|
166 |
src_install() { |
167 |
./build install programs "${D}" || die './build install programs' |
168 |
./build install man "${D}" || die './build install man' |
169 |
- ./build install manual "${D}" || die './build install manual' |
170 |
- ./build install macros "${D}" || die './build install macros' |
171 |
- ./build install docs "${D}" || die './build install docs' |
172 |
+ if use doc; then |
173 |
+ ./build install manual "${D}" || die './build install manual' |
174 |
+ ./build install macros "${D}" || die './build install macros' |
175 |
+ ./build install docs "${D}" || die './build install docs' |
176 |
+ fi |
177 |
} |