Respect LDFLAGS (bug #337615), CC (inherit toolchain-funcs). Use dobin and newman.

Package-Manager: portage-2.2_rc82/cvs/Linux i686

3 files changed, 79 insertions, 3 deletions

diff --git a/app-misc/oneko/ChangeLog b/app-misc/oneko/ChangeLog
index 053c36d5bca0..b596d3bc1ed4 100644
--- a/app-misc/oneko/ChangeLog
+++ b/app-misc/oneko/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/oneko
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/ChangeLog,v 1.16 2008/05/12 13:49:24 corsair Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/ChangeLog,v 1.17 2010/09/17 02:08:38 jer Exp $
+
+*oneko-1.2-r2 (17 Sep 2010)
+
+  17 Sep 2010; Jeroen Roovers <jer@gentoo.org> +oneko-1.2-r2.ebuild:
+  Respect LDFLAGS (bug #337615), CC (inherit toolchain-funcs). Use dobin and
+  newman.
 
   12 May 2008; Markus Rothe <corsair@gentoo.org> oneko-1.2-r1.ebuild:
   Stable on ppc64
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 09bd09ea824f..86e976e4d60a 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -4,6 +4,7 @@ DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 RMD160 5fec3d2ab8b834efc60af8b1a8afcf
 DIST oneko-1.2.sakura.5.tar.gz 76825 RMD160 ee82483ca324e411b53d667c379f7a6ab7d71278 SHA1 f48f41080e8acb76a7d30367f35afaeeb729721a SHA256 2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f
 DIST oneko-1.2.tar.gz 56353 RMD160 a433d22e51ab39056f360c91cbb7184421d58ca3 SHA1 9990b0b6e8870886807295044fa4c5b04b0342a8 SHA256 ec3332b757ed34de0ec7383b478cd94c841e7e3305518bcb44bd031579e37a01
 EBUILD oneko-1.2-r1.ebuild 1738 RMD160 411765d9171f4df22b249884327fc08227d5c501 SHA1 07a681c5f2c39afcf5d818cfba621098a1167649 SHA256 4a6d536e4a1c71ef4079be954149403ab05a6f5b0e86c39fedf71d96f792a885
+EBUILD oneko-1.2-r2.ebuild 1780 RMD160 bedd4d6f699bda6c7e3b17f07e0bb580fd5760d7 SHA1 a4a0498e5dd7cab75a1fa918891035c6a9b77265 SHA256 43e5495fb1e7be78abfb8ab353e98117df56b85c9a40a9bf74a57084690b1496
 EBUILD oneko-1.2.ebuild 767 RMD160 7b4673dd0a48240e472745476510e09fb8f82771 SHA1 3505ab809381dc0054dbcc2cdd59c30686265d98 SHA256 e5859d55c9012bb3ac3d17ba0f23eb0a1a028b590f91ed8ccc9e61dce2457745
-MISC ChangeLog 1660 RMD160 de69516be991ba7924d9d521756a8596892f26ec SHA1 d6b1f4b643313e03a42751da982f3bd89540801b SHA256 11813e351fd176181e5ad34776d8316f9ae14c58d5d1f0dc47336c625e09acee
+MISC ChangeLog 1842 RMD160 6d326750078b0b144d97b5f900a9667dfb6db464 SHA1 f5d0bd2e1061d232134b2e8d0bbac405a68a3977 SHA256 5c2214a3fbd2cb50ffc3a425613d8b9786e406f5fb9f65de2d37f56b3b329db2
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild
new file mode 100644
index 000000000000..b07e633534d5
--- /dev/null
+++ b/app-misc/oneko/oneko-1.2-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2-r2.ebuild,v 1.1 2010/09/17 02:08:40 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
+HOMEPAGE="http://www.daidouji.com/oneko/"
+SRC_URI="http://www.daidouji.com/oneko/distfiles/${P}.sakura.5.tar.gz
+	mirror://gentoo/${P}-cat.png
+	mirror://gentoo/${P}-dog.png
+	mirror://gentoo/${P}-sakura-nobsd.patch.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake
+	app-text/rman
+	x11-proto/xextproto"
+
+S="${WORKDIR}/oneko-${PV}.sakura.5"
+
+src_prepare() {
+	epatch "${WORKDIR}/${P}-sakura-nobsd.patch"
+}
+
+src_configure() {
+	xmkmf -a || die "running xmkmf failed!"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		|| die "make failed!"
+}
+
+src_install() {
+	dobin oneko
+	newman oneko._man oneko.1x
+	dodoc README README-NEW README-SUPP
+	newicon "${DISTDIR}/${P}-cat.png" "cat.png"
+	newicon "${DISTDIR}/${P}-dog.png" "dog.png"
+	make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
+	make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
+	make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
+}
+
+pkg_postinst() {
+	elog "To kill oneko, type the following in a terminal:"
+	elog ""
+	elog "killall oneko"
+	elog ""
+	elog "If your mouse cursor changes to the default black cross"
+	elog "after running ${PN}, you should emerge x11-apps/xsetroot"
+	elog "and run:"
+	elog ""
+	elog "xsetroot -cursor_name left_ptr"
+	elog ""
+}