Add mono support. forcing as this mono will be unmasked once this is committed.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 56 insertions, 18 deletions

diff --git a/dev-util/jay/ChangeLog b/dev-util/jay/ChangeLog
index febcf62135a9..7a0f8a1acc44 100644
--- a/dev-util/jay/ChangeLog
+++ b/dev-util/jay/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/jay
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/ChangeLog,v 1.1 2009/04/15 11:20:50 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/ChangeLog,v 1.2 2009/05/12 19:02:28 ali_bush Exp $
+
+  12 May 2009; Alistair Bush <ali_bush@gentoo.org> jay-1.1.1-r2.ebuild:
+  Add mono support. Thanks to loki_val. see #265912
 
 *jay-1.1.1-r2 (15 Apr 2009)
 
diff --git a/dev-util/jay/Manifest b/dev-util/jay/Manifest
index b7fb9c29cedb..a09dd5aac000 100644
--- a/dev-util/jay/Manifest
+++ b/dev-util/jay/Manifest
@@ -1,4 +1,4 @@
 DIST jay-1.1.1.zip 679556 RMD160 22aaa15b61300326c278b79e0b43716fa4c7c826 SHA1 0f534ac5dcb5e59fea07b84d579c4c4e7b695419 SHA256 f4da396c80578653685d287cea1e32669ebdf148cc17eed9ba88e895942bd571
-EBUILD jay-1.1.1-r2.ebuild 1251 RMD160 db49eedfee4adc6ce09af73bd254d1632200f503 SHA1 120394c4ff98ff6ef64d26fa303fc6928bf74ca5 SHA256 d56bf2d854e3fcd7d68087b216ff82b941ce7cd0e344d21afc195f65c2d9638d
-MISC ChangeLog 896 RMD160 d950623b8cf146ca1baf7d688a42c9379d70f66e SHA1 047ca6f2b8f27871c2f2ff8c91af78c58f060f77 SHA256 2c9578d9b11230ba3da9c4b0adcf5b5bb2a55078495e7ad190a7f89d178d34b9
-MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
+EBUILD jay-1.1.1-r2.ebuild 1816 RMD160 141e3bfd1ceee66d7b28386c8d9bb83f0f067167 SHA1 0371fab841dd09f55cead882dbbbe1b1c17f3d10 SHA256 31a9d60fc445f79cdc1393867130f4b6d8ce4e9da15b8150ba1b62a5f157f827
+MISC ChangeLog 1021 RMD160 ad0342e9643bfa2685620aaab1240653b80f3ed8 SHA1 21ccb2dcb48d59822315c4fc83cd7601ea77c9f6 SHA256 dd840d2b07af3446393c6e2c64945e5109a2ef86f1644cbcf823e76b162e75c0
+MISC metadata.xml 178 RMD160 3643b70f2efc94edc50d135b66fa2eb53ab5e901 SHA1 7434030f83821e9881075128f3553835edc3aa2e SHA256 59719ce7ed2a90bd21c88642451ab1d66f0e9513136845bf1e69dab8368f4f91
diff --git a/dev-util/jay/jay-1.1.1-r2.ebuild b/dev-util/jay/jay-1.1.1-r2.ebuild
index 30375e13336c..c9d769ca0fbe 100644
--- a/dev-util/jay/jay-1.1.1-r2.ebuild
+++ b/dev-util/jay/jay-1.1.1-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild,v 1.1 2009/04/15 11:20:50 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild,v 1.2 2009/05/12 19:02:28 ali_bush Exp $
 
 EAPI="2"
-inherit java-pkg-2 toolchain-funcs
+
+inherit mono java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="A LALR(1) parser generator: Berkeley yacc retargeted to C# and Java"
 HOMEPAGE="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/package-summary.html"
@@ -11,38 +12,71 @@ SRC_URI="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/doc-files/src.zip -> ${P
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="java mono"
 
-RDEPEND=">=virtual/jre-1.4
-	!<=dev-lang/mono-2.4"
-DEPEND=">=virtual/jdk-1.4"
+COMMON_DEPEND="
+	!<=dev-lang/mono-2.4
+	mono? ( >dev-lang/mono-2.4 )
+	"
+RDEPEND="
+	${COMMOND_DEPEND}
+	java? (	>=virtual/jre-1.4 )
+	"
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	"
 
-S="${WORKDIR}/jay"
+S="${WORKDIR}/${PN}"
 
 RESTRICT="test"
 
 java_prepare() {
+	sed -i -r \
+		-e 's:^v4\s*=.*:v4 = ${JAVA_HOME}/bin:' \
+		-e 's:JAVAC\s*=.*:\0 ${JAVACFLAGS}:' \
+		yydebug/makefile || die
+}
+
+src_prepare() {
 	# Fix up ugly makefiles.
 	sed -i -r \
 		-e "s:^CC\s*=.*:CC = `tc-getCC`:" \
 		-e 's/^jay:.* \$e /\0$(LDFLAGS) /' \
 		-e '/^CFLAGS\s*=/d' \
 		 src/makefile || die
-
-	sed -i -r \
-		-e 's:^v4\s*=.*:v4 = ${JAVA_HOME}/bin:' \
-		-e 's:JAVAC\s*=.*:\0 ${JAVACFLAGS}:' \
-		yydebug/makefile || die
+	java-utils-2_src_prepare
 }
 
 src_compile() {
 	emake -C src jay || die "failed to build jay executable"
-	emake -C yydebug yydebug.jar || die "failed to build yydebug.jar"
+
+	if use java
+	then
+		emake -C yydebug yydebug.jar || die "failed to build yydebug.jar"
+	fi
+
+	if use mono
+	then
+		cd cs
+		/usr/bin/gmcs /target:library /out:yydebug.dll /keyfile:"${FILESDIR}/mono.snk" yyDebug.cs || die "Failed to compile yyDebug.cs"
+	fi
 }
 
 src_install() {
 	dobin src/jay || die
 	doman jay.1 || die
 	dodoc README || die
-	java-pkg_dojar yydebug/yydebug.jar
+	if use java
+	then
+		java-pkg_dojar yydebug/yydebug.jar
+		insinto /usr/share/jay
+		doins java/skeleton.{java,tables} || die
+	fi
+	if use mono
+	then
+		egacinstall cs/yydebug.dll
+		insinto /usr/share/jay
+		doins cs/skeleton.cs || die
+	fi
 }
diff --git a/dev-util/jay/metadata.xml b/dev-util/jay/metadata.xml
index 604e0a4238bb..d521372ac493 100644
--- a/dev-util/jay/metadata.xml
+++ b/dev-util/jay/metadata.xml
@@ -2,5 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<herd>mono</herd>
 </pkgmetadata>