Upload binary file mono.snk to mirrors wrt #373253 by Matt Turner

(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)

4 files changed, 36 insertions, 41 deletions

diff --git a/dev-util/jay/ChangeLog b/dev-util/jay/ChangeLog
index eef6ec6ca099..27678a58e7ea 100644
--- a/dev-util/jay/ChangeLog
+++ b/dev-util/jay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/jay
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/ChangeLog,v 1.7 2012/03/15 17:27:18 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/ChangeLog,v 1.8 2012/04/06 19:43:33 ssuominen Exp $
+
+  06 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> jay-1.1.1-r2.ebuild,
+  -files/mono.snk:
+  Upload binary file mono.snk to mirrors wrt #373253 by Matt Turner
 
   15 Mar 2012; Ralph Sennhauser <sera@gentoo.org> jay-1.1.1-r2.ebuild:
   Add missing build dep app-arch/unzip. #372621
diff --git a/dev-util/jay/files/mono.snk b/dev-util/jay/files/mono.snk
deleted file mode 100644
index 380116c18fc3..000000000000
--- a/dev-util/jay/files/mono.snk
+++ /dev/null
diff --git a/dev-util/jay/jay-1.1.1-r2.ebuild b/dev-util/jay/jay-1.1.1-r2.ebuild
index 57e1ebe52e7e..69125409d471 100644
--- a/dev-util/jay/jay-1.1.1-r2.ebuild
+++ b/dev-util/jay/jay-1.1.1-r2.ebuild
@@ -1,34 +1,29 @@
 # Copyright 1999-2012 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.5 2012/03/15 17:27:18 sera Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild,v 1.6 2012/04/06 19:43:33 ssuominen Exp $
 
+EAPI=4
 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"
-SRC_URI="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/doc-files/src.zip -> ${P}.zip"
+SRC_URI="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/doc-files/src.zip -> ${P}.zip
+	http://dev.gentoo.org/~ssuominen/${P}-mono.snk.bz2"
+
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="java mono"
 
-COMMON_DEPEND="
-	!<=dev-lang/mono-2.4
-	mono? ( >dev-lang/mono-2.4 )
-	"
-RDEPEND="
-	${COMMOND_DEPEND}
-	java? (	>=virtual/jre-1.4 )
-	"
-DEPEND="
-	${COMMON_DEPEND}
+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 )
-	app-arch/unzip
-	"
+	app-arch/unzip"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 RESTRICT="test"
 
@@ -40,44 +35,41 @@ java_prepare() {
 }
 
 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
+
 	java-utils-2_src_prepare
 }
 
 src_compile() {
-	emake -C src jay || die "failed to build jay executable"
-
-	if use java
-	then
-		emake -C yydebug yydebug.jar || die "failed to build yydebug.jar"
-	fi
+	emake -C src jay
+	use java && emake -C yydebug yydebug.jar
 
-	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"
+	if use mono; then
+		pushd cs >/dev/null
+		/usr/bin/gmcs /target:library /out:yydebug.dll /keyfile:"${WORKDIR}"/${P}-mono.snk yyDebug.cs || die
+		popd >/dev/null
 	fi
 }
 
 src_install() {
-	dobin src/jay || die
-	doman jay.1 || die
-	dodoc README || die
-	if use java
-	then
+	dobin src/jay
+
+	doman jay.1
+	dodoc README
+
+	if use java; then
 		java-pkg_dojar yydebug/yydebug.jar
 		insinto /usr/share/jay
-		doins java/skeleton.{java,tables} || die
+		doins java/skeleton.{java,tables}
 	fi
-	if use mono
-	then
+
+	if use mono; then
 		egacinstall cs/yydebug.dll
 		insinto /usr/share/jay
-		doins cs/skeleton.cs || die
+		doins cs/skeleton.cs
 	fi
 }
diff --git a/dev-util/jay/metadata.xml b/dev-util/jay/metadata.xml
index 5318d91a9ce8..331dbe87a1f3 100644
--- a/dev-util/jay/metadata.xml
+++ b/dev-util/jay/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<herd>dotnet</herd>
+<herd>java</herd>
+<herd>dotnet</herd>
 </pkgmetadata>
-