+++ /dev/null
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="A Java Windowing Toolkit for Text Terminals"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}/charva.zip -> ${P}.zip"
-HOMEPAGE="http://www.pitman.co.za/projects/charva/"
-RDEPEND=">=virtual/jre-1.5
- sys-libs/ncurses
- dev-java/commons-logging:0"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${RDEPEND}"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
- epatch "${FILESDIR}"/${PN}-respect-flags.patch
-
- rm -v ./c/lib/*.so || die
- rm -v java/lib/* || die
- rm -v java/dist/lib/* || die
- find . -name "*.class" -print -delete || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-logging"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
- java-pkg-2_src_compile
- cd c/src
- emake CC="$(tc-getCC)" INCLUDES="$(java-pkg_get-jni-cflags)" -f Makefile.linux.txt
-}
-
-src_install() {
- java-pkg_dojar ./java/dist/lib/charva.jar
- use doc && java-pkg_dojavadoc docs/api
- use examples && java-pkg_doexamples test/src/example
- use source && java-pkg_dosrc java/src/{charva,charvax}
-
- java-pkg_doso c/lib/*.so
-}
+++ /dev/null
---- c/src/Makefile.linux.txt
-+++ c/src/Makefile.linux.txt
-@@ -5,14 +5,14 @@
- SHARED_OBJECT_EXT = so\r
- TARGET = libTerminal.${SHARED_OBJECT_EXT}\r
- \r
--CC = gcc\r
-+CC ?= gcc\r
- # "-D_USE_NCURSESW" was added for handling UTF-8 characters (contributed by Leos Urban)\r
--CFLAGS = -fpic -shared -D_USE_NCURSESW_\r
-+CFLAGS += -fpic -shared -D_USE_NCURSESW_\r
- \r
- # The file "jni.h" is in ${JAVA_HOME}/include\r
- # The file "jni_md.h" (included from jni.h) contains machine-dependent \r
- # type definitions and is in ${JAVA_HOME}/include/${OS}\r
--INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include\r
-+INCLUDES ?= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include\r
- \r
- # Changed "-lncurses" to "-lncursesw" (Leos Urban)\r
- LIBS = -lncursesw\r
-@@ -21,5 +21,5 @@
- all : ${TARGET}\r
- \r
- ${TARGET} : Toolkit.c ../include/charva_awt_Toolkit.h Makefile.${OS}.txt\r
-- ${CC} ${CFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}\r
-+ ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}\r
- \r
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">charva</remote-id>
- </upstream>
-</pkgmetadata>