[gentoo-commits] proj/betagarden:master commit in: app-doc/yodl/, app-doc/yodl/files/

[gentoo-commits] proj/betagarden:master commit in: app-doc/yodl/, app-doc/yodl/files/

[Justin Lecher]

commit:     31e7f4e94c89c778b2124e9b8e82d6064de1c55b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 07:42:00 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:42:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=31e7f4e9

Version BUmp, Fixed all QA issues

(Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 app-doc/yodl/ChangeLog                             |   10 ++++
 app-doc/yodl/files/yodl-3.00.0-ldflags.patch       |   52 ++++++++++++++++++++
 app-doc/yodl/metadata.xml                          |    6 ++
 .../{yodl-2.15.2.ebuild => yodl-3.00.0.ebuild}     |   33 +++++++++---
 4 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/app-doc/yodl/ChangeLog b/app-doc/yodl/ChangeLog
new file mode 100644
index 0000000..63354f3
--- /dev/null
+++ b/app-doc/yodl/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for app-doc/yodl
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*yodl-3.00.0 (29 Apr 2011)
+
+  29 Apr 2011; Justin Lecher <jlec@gentoo.org> -yodl-2.15.2.ebuild,
+  +yodl-3.00.0.ebuild, +files/yodl-3.00.0-ldflags.patch, +metadata.xml:
+  Version BUmp, Fixed all QA issues
+

diff --git a/app-doc/yodl/files/yodl-3.00.0-ldflags.patch b/app-doc/yodl/files/yodl-3.00.0-ldflags.patch
new file mode 100644
index 0000000..4d31204
--- /dev/null
+++ b/app-doc/yodl/files/yodl-3.00.0-ldflags.patch
@@ -0,0 +1,52 @@
+ INSTALL.im        |    4 +++-
+ icmake/program    |    2 +-
+ icmake/stdcompile |    2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/INSTALL.im b/INSTALL.im
+index 369885d..4b7532f 100644
+--- a/INSTALL.im
++++ b/INSTALL.im
+@@ -56,6 +56,8 @@ string COMPILER;
+     // used with the gprof profiler. When specified, no stripping is performed
+     // at ./build program strip (see INSTALL)
+ 
++string LDFLAGS;
++
+ void setLocations()
+ {
+     BASE    = "/usr";
+@@ -65,7 +67,7 @@ void setLocations()
+     MAN     = BASE + "/share/man";    
+     DOC     = BASE + "/share/doc/yodl";
+     DOCDOC  = BASE + "/share/doc/yodl-doc";
+-
++    LDFLAGS = "GENTOOLDFLAGS";
+     COMPILER = "gcc";
+ //    COMPILER = "gcc-4.5";
+ }
+diff --git a/icmake/program b/icmake/program
+index 70e7e10..81f873c 100644
+--- a/icmake/program
++++ b/icmake/program
+@@ -17,7 +17,7 @@ void programYodlpost()
+ 
+ void programYodlverbinsert()
+ {
+-    run(COMPILER + " -o " + g_install + BIN + "/yodlverbinsert " + g_copt +
++    run(COMPILER + " " + LDFLAGS + " -o " + g_install + BIN + "/yodlverbinsert " + g_copt +
+                    " src/verbinsert/verbinsert.c " + g_lopt);
+ }
+ 
+diff --git a/icmake/stdcompile b/icmake/stdcompile
+index 57f0b99..7e011cd 100644
+--- a/icmake/stdcompile
++++ b/icmake/stdcompile
+@@ -1,6 +1,6 @@
+ void link(string program)
+ {
+-    exec(COMPILER, "-o", g_install + BIN + "/" + program,
++    exec(COMPILER, LDFLAGS, "-o", g_install + BIN + "/" + program,
+                     g_wip + program + "/*.o", 
+                     "-L" + g_wip, "-lyodl", g_lopt);
+ }

diff --git a/app-doc/yodl/metadata.xml b/app-doc/yodl/metadata.xml
new file mode 100644
index 0000000..e6233b5
--- /dev/null
+++ b/app-doc/yodl/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+</pkgmetadata>

diff --git a/app-doc/yodl/yodl-2.15.2.ebuild b/app-doc/yodl/yodl-3.00.0.ebuild
similarity index 52%
rename from app-doc/yodl/yodl-2.15.2.ebuild
rename to app-doc/yodl/yodl-3.00.0.ebuild
index 95af8a9..5d3197d 100644
--- a/app-doc/yodl/yodl-2.15.2.ebuild
+++ b/app-doc/yodl/yodl-3.00.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Tools to process files written in Your Own Document Language (Yodl)"
 HOMEPAGE="http://yodl.sourceforge.net/"
@@ -11,29 +13,42 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${PN}_${PV}.orig.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
 
-DEPEND="dev-util/icmake
+DEPEND="
+	dev-util/icmake
 	dev-texlive/texlive-latex"
 RDEPEND=""
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
 	sed 's|^#define COPT .\+$|#define COPT "'"${CXXFLAGS}"'"|' -i build \
 		|| die 'sed failed (file missing)'
+	sed \
+		-e "s:GENTOOLDFLAGS:${LDFLAGS}:g" \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		-e "s:/share/doc/yodl:/share/doc/${PF}:g" \
+		-e "s:/share/doc/yodl-doc:/share/doc/${PN}:g" \
+		-e "/COMPILER/s:\"gcc\":\"$(tc-getCC)\":g" \
+		-i INSTALL.im || die
 }
 
 src_compile() {
 	addpredict /var/cache/fonts  # TODO proper fix
 	./build programs || die './build programs'
 	./build man || die './build man'
-	./build manual || die './build manual'
-	./build macros || die './build macros'
+	if use doc; then
+		./build manual || die './build manual'
+		./build macros || die './build macros'
+	fi
 }
 
 src_install() {
 	./build install programs "${D}" || die './build install programs'
 	./build install man "${D}" || die './build install man'
-	./build install manual "${D}" || die './build install manual'
-	./build install macros "${D}" || die './build install macros'
-	./build install docs "${D}" || die './build install docs'
+	if use doc; then
+		./build install manual "${D}" || die './build install manual'
+		./build install macros "${D}" || die './build install macros'
+		./build install docs "${D}" || die './build install docs'
+	fi
 }