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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 104 insertions, 3 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/Manifest b/x11-misc/xcalendar/Manifest
index 18e93f59ff0b..5c8caa3c97bc 100644
--- a/x11-misc/xcalendar/Manifest
+++ b/x11-misc/xcalendar/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xcalendar-4.0-implicits.patch 381 RMD160 e52ad2af164f8a4987436f553bdcd0bc093bd457 SHA1 ee6887a45546a798547b6e229ab45795c7c9b0a6 SHA256 6d84f6b075b0e838863a5732f16ceac0bdc8203bd3a289fc4f126aedf00f6a87
 AUX xcalendar-4.0-motif-gentoo.diff 1104 RMD160 c86ba3abbc7a317a33939c89ccaba7589382709c SHA1 4393cbde0b4efad7f60456413b3d1613dec015bd SHA256 c1f3fdc391f51db457b7fe1de066a6f1faced4b31d69715fbd9e2d12e847c135
 DIST xcalendar-4.0+i18n.tar.gz 48635 RMD160 88f8ac6f735f93cb3679b118ff4ee9b735ca5e5c SHA1 9b5e2e3a7de4a4b5d2e36d685ebfc229d7dbe54c SHA256 f4c45d863c2a8a04bfcc4180cb06bd13bbdc26f855578e99b1e459e834c6fd7f
+EBUILD xcalendar-4.0-r1.ebuild 1437 RMD160 a20bd052c6447f476f20d143d20d86852e77a113 SHA1 bed969d09006c8116f122c3d3ab23ff64ca2964e SHA256 fb637ceeaf092929bc4235cfcce761c098ebd7b08d775064a519c93dd673a7fb
 EBUILD xcalendar-4.0.ebuild 1170 RMD160 2f2181301ea2072307bcc28350bec683eeffb985 SHA1 a1ad6dbf1a8a536f1dd43b964ed9ca9725ef5bfb SHA256 df1fb6857e35cb33129692a4fe9d6d4f30748d0b58a50483b0ccc99341df0886
-MISC ChangeLog 2358 RMD160 e1ab651575de0c029c28f32a53ac6bc2aed2df05 SHA1 f039e1f43cc545506f12df4d2f8c6686ac6c2602 SHA256 0f2085c625c664b25191db316768267a2de224ffb399b8cff28b3c7a626327b9
+MISC ChangeLog 2699 RMD160 5a4124acb98ad41ee14aaa8ec4604c2bbec87ad6 SHA1 e3eb8bf1d865d401b443fa9714f3b16151db356f SHA256 aeac34ce93659f0dbd730235fc34d1c080e9d50ec02d0018284970e9b85f0c51
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkx+a/kACgkQIiMqcbOVdxQl0QP+K2pVyxeZJgPCtmtX7gwX2wE5
++SrrljN4Dn46XuNFYYSTl/oCi3E73nbnmRRtBoMc8+NbkRB/N1nQSBfmaxorx9Ga
+fVxAfSVL/2itOKeVIRRb+D0Eb/mUFjb9OFxZ+siSjHJuLrJ9/zgoHJdfJZcAeKXA
+noowNgE94W7zLVqyMLo=
+=rJnC
+-----END PGP SIGNATURE-----
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
+}