Respect CC,CFLAGS,LDFLAGS. Fixes bug 335520. Thanks to Diego for the report. Fix multilib paths and implicit functions declarations. Add missing dependency on x11-misc/gccmakedep

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 89 insertions, 2 deletions

diff --git a/x11-misc/xcalendar/ChangeLog b/x11-misc/xcalendar/ChangeLog
index 92cc49f72ee6..61c0f389d5ad 100644
--- a/x11-misc/xcalendar/ChangeLog
+++ b/x11-misc/xcalendar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xcalendar
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalendar/ChangeLog,v 1.21 2008/03/23 15:17:34 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalendar/ChangeLog,v 1.22 2010/09/01 15:06:23 xarthisius Exp $
+
+*xcalendar-4.0-r1 (01 Sep 2010)
+
+  01 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +xcalendar-4.0-r1.ebuild, +files/xcalendar-4.0-implicits.patch:
+  Respect CC,CFLAGS,LDFLAGS. Fixes bug 335520. Thanks to Diego for the
+  report. Fix multilib paths and implicit functions declarations. Add
+  missing dependency on x11-misc/gccmakedep
 
   23 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> xcalendar-4.0.ebuild:
   amd64 stable
diff --git a/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch b/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch
new file mode 100644
index 000000000000..977ca96e572f
--- /dev/null
+++ b/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch
@@ -0,0 +1,22 @@
+Fix implicit functions declarations
+
+--- xcalendar/xcalendar.h
++++ xcalendar/xcalendar.h
+@@ -37,6 +37,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include  <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <X11/Intrinsic.h>
+--- xcalendar/lists.c
++++ xcalendar/lists.c
+@@ -25,6 +25,7 @@
+ 
+ #include "xcalendar.h"
+ 
++is_last(LList *list);
+ 
+ List 
+ CreateList(length, elementSize)
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild
new file mode 100644
index 000000000000..f37f2f76eb77
--- /dev/null
+++ b/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild,v 1.1 2010/09/01 15:06:23 xarthisius Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+DESCRIPTION="A simple interactive calendar program with a notebook capability"
+HOMEPAGE="http://www.freebsd.org/"
+SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i18n.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="motif"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	x11-proto/xproto
+	x11-misc/gccmakedep
+	motif? ( x11-libs/openmotif )"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	use motif && epatch "${FILESDIR}"/${P}-motif-gentoo.diff
+	epatch "${FILESDIR}"/${P}-implicits.patch
+	sed -e "s:%%XCALENDAR_LIBDIR%%:/usr/$(get_libdir)/xcalendar:" \
+		-e "s:/usr/local/X11R5/lib/X11/:/usr/$(get_libdir)/:" \
+		-i XCalendar.sed || die
+}
+
+src_compile() {
+	xmkmf -a
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"  || die
+}
+
+src_install() {
+	dobin xcalendar || die
+	newman xcalendar.man xcalendar.1 || die
+
+	dodir /etc/X11/app-defaults
+	insinto /etc/X11/app-defaults
+	newins XCalendar.sed XCalendar || die
+
+	insinto /usr/$(get_libdir)/xcalendar
+	doins *.xbm *.hlp || die
+
+	dodoc README || die
+}