x11-libs/pdcurses: Version bump to 3.4, bug 94414, thanks to binki, chithead, Xarthisius and xmw

svn path=/sunrise/; revision=10486

7 files changed, 148 insertions, 155 deletions

diff --git a/x11-libs/pdcurses/ChangeLog b/x11-libs/pdcurses/ChangeLog
index fe0814c7f..74129f60f 100644
--- a/x11-libs/pdcurses/ChangeLog
+++ b/x11-libs/pdcurses/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for x11-libs/pdcurses
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Apr 2010; Denilson (CrazyTB) <denilsonsa@gmail.com>
+  -pdcurses-2.8.ebuild, -files/pdcurses-2.8-configure.patch,
+  +pdcurses-3.4.ebuild, +files/pdcurses-3.4-configure.patch, metadata.xml:
+  Version bump to 3.4, bug 94414, thanks to binki, chithead, Xarthisius and xmw
+
   31 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> metadata.xml:
   Add local useflags to metadata.xml (GLEP 56)
 
diff --git a/x11-libs/pdcurses/Manifest b/x11-libs/pdcurses/Manifest
index d3cadb3d0..cda0520fd 100644
--- a/x11-libs/pdcurses/Manifest
+++ b/x11-libs/pdcurses/Manifest
@@ -1,5 +1,5 @@
-AUX pdcurses-2.8-configure.patch 1379 RMD160 f9ac5eca0c4626284a37e07ef7778acddb7869dc SHA1 a16922aef14efb9e89180c7bd1d1aa1be1d0fbf2 SHA256 114acd433bab0d1afa82aed8717b92bae732d3448891ca28c94b03bd50ff7132
-DIST PDCurses-2.8.tar.gz 325074 RMD160 7976ad40a13bdcc2e72e7d4bf396d7f8d5a237b8 SHA1 219b9028616af9cad50ba25d41b3673690d005b1 SHA256 e288ac5191de78c31635372f7cd31676561f5a9588258f41dac771ee9248b095
-EBUILD pdcurses-2.8.ebuild 1907 RMD160 c623c94ee7f8279e5007b135c6f65bf9738056aa SHA1 9205e437f36a21338bcc73611cf8b94f8063b2b0 SHA256 fa1effd3a76030af72e8b1e80485241ebb0ba1796672a6ef8588066e917406e2
-MISC ChangeLog 709 RMD160 1987d601e48634060bd1d521f923fcef663eafb2 SHA1 e3e6e19903f29bb4e81c9eaea072c033897b8e19 SHA256 6ede46372dcfbeac985af8d243662c9f0d28f24ebb762a833a47b65ba2175b6d
-MISC metadata.xml 364 RMD160 d4bb02c339315a0b8009ad70ecb3416640f5e248 SHA1 6f06c07964a078dd47ab0489b3e4544c4eecf8cd SHA256 01b187694b76f5bf66920a2f57ab24782eb9501f81f1d5b89a9db65aecf9e8dc
+AUX pdcurses-3.4-configure.patch 1301 RMD160 6caa4f5c2c12625d93fe824c75ebd3e7f67de0f4 SHA1 ff23b5e10d6802704b4736ebb50eb4ce56e787c5 SHA256 522d098921ac48931a0207655cdb2bdd42e000693218b8d6605dfe02bb696578
+DIST PDCurses-3.4.tar.gz 331253 RMD160 94d697d9879212ce619dafe045eef771a13ffa46 SHA1 e36684442a6171cc3a5165c8c49c70f67db7288c SHA256 46ad8fd439e71d44819ea884d775ccbf653b9f8b1f7a418a0cce3a510aa2e64b
+EBUILD pdcurses-3.4.ebuild 1951 RMD160 bd02c3139f4d748dcbb2092cf0e7044e0ad11402 SHA1 38f27cd35b47fe2c17c7d839a1639768d5331a74 SHA256 adf0efa20898191de03d3cfeacacd9b42a78f6ec3ad2baf2d6959560b3732407
+MISC ChangeLog 983 RMD160 45e399528729fad5b7be230591226908d444fce9 SHA1 c2a218116f9454feff8c190f2167f45e6f2825b8 SHA256 c5105f845b69f6511ac1f33e266cc829f5f2684e4c1a981099c8fe398031d719
+MISC metadata.xml 301 RMD160 a463810c4b0a9905def5a9c4eda1f71cc27c733c SHA1 a042bfe36dceccc754b7e2120eb1abb8ed9ff91b SHA256 46f61d1d7b51f4961cbaf523a5d3879912c9500b3306a54409e6cd309ccb534e
diff --git a/x11-libs/pdcurses/files/pdcurses-2.8-configure.patch b/x11-libs/pdcurses/files/pdcurses-2.8-configure.patch
deleted file mode 100644
index 2e050efbc..000000000
--- a/x11-libs/pdcurses/files/pdcurses-2.8-configure.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- configure.ac.orig	2006-08-12 10:48:37.000000000 +0200
-+++ configure.ac	2006-08-12 10:49:05.000000000 +0200
-@@ -6,8 +6,7 @@
- 
- dnl ---------------------- check for C compiler -----------------
- dnl Checks for one of the C compilers below - change if yours not there.
--CC_LIST="gcc acc cc c89"
--MH_PROG_CC
-+AC_PROG_CC
- AC_ISC_POSIX
- 
- AC_CONFIG_HEADER(config.h)
-@@ -131,7 +130,7 @@
- 	if test "$with_debug" = yes; then
- 		CFLAGS="${CFLAGS} -Wall"
- 	else
--		CFLAGS="-O2 -Wall -fomit-frame-pointer"
-+		CFLAGS="${CFLAGS}"
- 	fi
- fi
- if test "$on_qnx" = yes; then
-@@ -150,7 +149,7 @@
- 	[with_latin1=no],
- )
- if test "$with_latin1" = yes; then
--	AC_DEFINE(INCLUDE_LATIN1)
-+	AC_DEFINE([INCLUDE_LATIN1], [1], [Define if --with-latin1 is set])
- fi
- 
- dnl ----------------- check for Purify support -----------------------
-@@ -175,7 +174,7 @@
- 	[with_xaw3d=no],
- )
- if test "$with_xaw3d" = yes; then
--	AC_DEFINE(USE_XAW3D)
-+	AC_DEFINE([USE_XAW3D], [1], [Use Xaw3d])
- fi
- 
- dnl ---------------------- check for neXtaw library -------------------
-@@ -186,7 +185,7 @@
- 	[with_nextaw=no],
- )
- if test "$with_nextaw" = yes; then
--	AC_DEFINE(USE_NEXTAW)
-+	AC_DEFINE([USE_NEXTAW], [1], [Use neXtaw])
- fi
- 
- dnl --------------- Check how to make shared libraries -------------------
-@@ -204,3 +203,5 @@
-         *)
-                 ;;
- esac
-+
-+AC_DEFINE([PDC_MAX_SIGNALS], [], [PDC_MAX_SIGNALS])
diff --git a/x11-libs/pdcurses/files/pdcurses-3.4-configure.patch b/x11-libs/pdcurses/files/pdcurses-3.4-configure.patch
new file mode 100644
index 000000000..6989c2060
--- /dev/null
+++ b/x11-libs/pdcurses/files/pdcurses-3.4-configure.patch
@@ -0,0 +1,50 @@
+--- configure.ac.orig	2010-04-25 14:18:36.000000000 -0300
++++ configure.ac	2010-04-25 14:20:46.000000000 -0300
+@@ -83,45 +83,8 @@
+ if test $ac_cv_header_xpm_h = yes; then
+ 	MH_XLIBS="$MH_XLIBS -lXpm"
+ fi
+-dnl ---------- allow --enable-debug to compile in debug mode ---------
+-AC_ARG_ENABLE(debug,
+-	[  --enable-debug          turn on debugging],
+-	[with_debug=$enableval],
+-	[with_debug=no],
+-)
+-cflags_g="`echo $CFLAGS | grep -c '\-g'`"
+-cflags_O="`echo $CFLAGS | grep -c '\-O'`"
+-
+-if test "$with_debug" = yes; then
+-	if test "$cflags_g" = "0"; then
+-		CFLAGS="${CFLAGS} -g"
+-	fi
+-	if test "$cflags_O" != "0"; then
+-		CFLAGS="`echo ${CFLAGS} | sed -e s/-O.//`"
+-	fi
+-	CFLAGS="${CFLAGS} -DPDCDEBUG"
+-else
+-	if test "$cflags_O" = "0"; then
+-		CFLAGS="${CFLAGS} -O"
+-	fi
+-	if test "$cflags_g" != "0"; then
+-		CFLAGS="`echo ${CFLAGS} | sed -e s/-g//`"
+-	fi
+-fi
+-if test "$ac_cv_prog_CC" = "gcc"; then
+-	if test "$with_debug" = yes; then
+-		CFLAGS="${CFLAGS} -Wall"
+-	else
+-		CFLAGS="-O2 -Wall -fomit-frame-pointer"
+-	fi
+-fi
+-if test "$on_qnx" = yes; then
+-	if test "$with_debug" = yes; then
+-		CFLAGS="-g"
+-	else
+-		CFLAGS="-Otax"
+-	fi
+-fi
++
++CFLAGS="${CFLAGS} -Wall"
+ 
+ dnl --------------- check for wide character support -----------------
+ dnl allow --enable-widec to include wide character support
diff --git a/x11-libs/pdcurses/metadata.xml b/x11-libs/pdcurses/metadata.xml
index 5490db830..6afb70a02 100644
--- a/x11-libs/pdcurses/metadata.xml
+++ b/x11-libs/pdcurses/metadata.xml
@@ -4,7 +4,6 @@
 	<herd>no-herd</herd>
 	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
 	<use>
-		<flag name='latin1'>Add support for latin1 characters</flag>
 		<flag name='nextaw'>Use neXtaw instead of Xaw</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-libs/pdcurses/pdcurses-2.8.ebuild b/x11-libs/pdcurses/pdcurses-2.8.ebuild
deleted file mode 100644
index 46de07c4b..000000000
--- a/x11-libs/pdcurses/pdcurses-2.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils
-
-MY_P=${P/pdc/PDC}
-
-DESCRIPTION="A public domain curses library for DOS, OS/2, Win32 and X11"
-HOMEPAGE="http://pdcurses.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-KEYWORDS="~x86"
-
-LICENSE="public-domain GPL-2"
-SLOT="0"
-IUSE="debug doc examples latin1 nextaw Xaw3d"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXpm
-	x11-proto/xproto
-	nextaw? ( x11-libs/neXtaw )
-	Xaw3d? ( x11-libs/Xaw3d )
-	!nextaw? ( !Xaw3d? ( x11-libs/libXaw ) )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use Xaw3d && use nextaw ; then
-		elog "You have both Xaw3d and nextaw USE-flags set,"
-		elog "Xaw3d will be used."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-configure.patch"
-
-	# Fixing -jX problems:
-	sed -i \
-		-e 's/\(PDCurses.man:\)/\1 manext/' \
-		tools/Makefile.in || die "sed failed"
-
-	# Fixing soname problem:
-	sed -i \
-		-e "s/\(\$(LD_RXLIB1)\)/\1 -Wl,-soname,libXcurses.so.${PV%.*}/" \
-		pdcurses/Makefile.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_compile() {
-
-	if ! use examples ; then
-		sed -i \
-			-e 's/\(^all[ \t]::[\t a-z]*\) demos/\1/' \
-			-e '/demos/d' \
-			Makefile.in || die "sed failed"
-	fi
-
-	if ! use doc ; then
-		sed -i \
-			-e '/tools/d' \
-			Makefile.in || die "sed failed"
-	fi
-
-	econf \
-		$(use_with Xaw3d xaw3d) \
-		$(use_with nextaw) \
-		$(use_enable debug) \
-		$(use_enable latin1) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc HISTORY README TODO doc/*
-
-	if use doc ; then
-		dodoc tools/PDCurses.man
-	fi
-	if use examples ; then
-		insinto /usr/share/${PN}/examples
-		cd demos
-		doins *.{h,c} $(sed -e 's/^DEMOS[ \t]*=\ \(.*\)/\1/p' -e 'd' Makefile.in)
-	fi
-
-}
diff --git a/x11-libs/pdcurses/pdcurses-3.4.ebuild b/x11-libs/pdcurses/pdcurses-3.4.ebuild
new file mode 100644
index 000000000..2c07f0cd5
--- /dev/null
+++ b/x11-libs/pdcurses/pdcurses-3.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit autotools eutils
+
+MY_P=${P/pdc/PDC}
+
+DESCRIPTION="A public domain curses library for DOS, OS/2, Win32, X11"
+HOMEPAGE="http://pdcurses.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: add SDL support
+IUSE="doc examples nextaw Xaw3d"
+
+RDEPEND="Xaw3d? ( x11-libs/Xaw3d )
+	!Xaw3d? (
+		nextaw? ( x11-libs/neXtaw )
+		!nextaw? ( x11-libs/libXaw )
+	)"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use nextaw && use Xaw3d ; then
+		elog "You have both nextaw and Xaw3d USE-flags set, Xaw3d will be used."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-configure.patch"
+
+	# Fixing soname problem
+	sed -i -e "s/\(\$(LD_RXLIB1)\)/\1 -Wl,-soname,libXcurses.so.${PV%.*}/" \
+		x11/Makefile.in || die
+
+	# Fixing absolute symlinks
+	sed -i -e 's:\(ln -f -s \)$(libdir)/:\1:' \
+		Makefile.in || die
+
+	# Fixing tuidemo path
+	sed -i -e 's:\.\.[/\\]demos[/\\]::' \
+		demos/tuidemo.c || die
+
+	# If enabled, uses "manext" to create a 160K doc/PDCurses.txt
+	if ! use doc ; then
+		sed -i -e '/cd doc; $(MAKE)/d' \
+			Makefile.in || die
+	fi
+
+	# Removing the $(DEMOS) from all target
+	if ! use examples ; then
+		sed -i -e 's/\(^all:[\t a-zA-Z$()]*\) $(DEMOS)/\1/' \
+			x11/Makefile.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with nextaw) \
+		$(use_with Xaw3d xaw3d)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc HISTORY IMPLEMNT README doc/*.txt || die
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demos/*.[ch] || die
+
+		exeinto /usr/share/doc/${PF}/examples
+		cd "${S}/x11" || die
+		# Which one is better?
+		#doins $(sed -e 's/^DEMOS[ \t]*=\(.*\)/\1/p' -e 'd' Makefile.in)
+		doexe $(sed -n -e 's/^DEMOS[ \t]*=\(.*\)/\1/p' Makefile.in) || die
+	fi
+}