Version BUmp, Fixed all QA issues

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

5 files changed, 107 insertions, 11 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/Manifest b/app-doc/yodl/Manifest
index cad3c39..2dca048 100644
--- a/app-doc/yodl/Manifest
+++ b/app-doc/yodl/Manifest
@@ -1,2 +1,15 @@
-DIST yodl_2.15.2.orig.tar.gz 292678 RMD160 dc6567b0493740a382a1629025565551c8f693f5 SHA1 00434bcff81bc8ce80cedd427dd88a7104e2131c SHA256 12b508717ea4e93dd2d4a5cea977c297001a4dcd5b4e1197b7f9eb2d07e8ae6c
-EBUILD yodl-2.15.2.ebuild 1135 RMD160 ff362d4c8dfff5686e6b549214550aa6141fbc75 SHA1 c5c891ca215647cae19d68f0914ac498e6520cf1 SHA256 fb98a38b85edad5099b6fa52e5aa10ca1f3b7c57c083aa0894e301b60c1106d9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX yodl-3.00.0-ldflags.patch 1562 RMD160 89786293e5b442496815e5073b6ccbfd3cfe247d SHA1 d0444099eccaae9f436f04f4093d88eb413380b4 SHA256 8419a424ad98843e63199112147603a57c1de9178bafa4199a5252336c971b5e
+DIST yodl_3.00.0.orig.tar.gz 294797 RMD160 1c46da05bd227efdd920ea1f4f15b0841103c3bf SHA1 909a34cf3e6d5429d8f8554fbace90d4d49ebc75 SHA256 321e30794373ff651c44a84a7c5137e43d772c8b0b54b8698869432081e1b86c
+EBUILD yodl-3.00.0.ebuild 1506 RMD160 f42d010923530d685442a03e4ef19c01c7c493d8 SHA1 a5dce90f523db4b61695cae0212e5b31c3016783 SHA256 f4563a40afca87f976dac207ba464b228273d746719887046b770961e2ddc011
+MISC ChangeLog 318 RMD160 190187791e22d0a3a92e36b68e5a1e43fcf841c3 SHA1 51a4c583af1bdc21183f39f8b28ae56cde18ba30 SHA256 92a4349bcbb4f9bf01f400e1fa96eb432d3379d58b9deb09c5e7e64d8314ae9a
+MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk26a8gACgkQgAnW8HDreRY/pgCeOIeoMYRe5GL0VsFNjldaMZXc
+6iYAoMKuSewUUTeO5HAazZPDcZ4t0ysb
+=aV1S
+-----END PGP SIGNATURE-----
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
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
 }