Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/xrmap: xrmap-2.33.ebuild ChangeLog
Date: Fri, 28 May 2010 21:10:07
Message-Id: 20100528211004.1FDBD2CF37@corvid.gentoo.org
1 hwoarang 10/05/28 21:10:03
2
3 Modified: ChangeLog
4 Added: xrmap-2.33.ebuild
5 Log:
6 Version bump. Fixes bug #309661
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.17 x11-misc/xrmap/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/ChangeLog?rev=1.17&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/ChangeLog?rev=1.17&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/ChangeLog?r1=1.16&r2=1.17
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v
19 retrieving revision 1.16
20 retrieving revision 1.17
21 diff -u -r1.16 -r1.17
22 --- ChangeLog 6 Feb 2010 21:14:02 -0000 1.16
23 +++ ChangeLog 28 May 2010 21:10:03 -0000 1.17
24 @@ -1,6 +1,11 @@
25 # ChangeLog for x11-misc/xrmap
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.16 2010/02/06 21:14:02 ssuominen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.17 2010/05/28 21:10:03 hwoarang Exp $
29 +
30 +*xrmap-2.33 (28 May 2010)
31 +
32 + 28 May 2010; Markos Chandras <hwoarang@g.o> +xrmap-2.33.ebuild:
33 + Version bump. Fixes bug #309661
34
35 06 Feb 2010; Samuli Suominen <ssuominen@g.o> xrmap-2.32.ebuild,
36 +files/xrmap-2.32-asneeded.patch:
37
38
39
40 1.1 x11-misc/xrmap/xrmap-2.33.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild?rev=1.1&content-type=text/plain
44
45 Index: xrmap-2.33.ebuild
46 ===================================================================
47 # Copyright 1999-2010 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.1 2010/05/28 21:10:03 hwoarang Exp $
50
51 inherit eutils
52
53 DESCRIPTION="a X client for generating images of the Earth and manipulating the CIA World data bank"
54 HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
55 FULL_DIST="2.10"
56 SRC_URI="ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${PN}-${FULL_DIST}.tgz
57 ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${P}.tar.bz2
58 ftp://ftp.ac-grenoble.fr/ge/geosciences/CIA_WDB2.jpd.gz"
59
60 LICENSE="GPL-2"
61 SLOT="0"
62 KEYWORDS="~x86 ~amd64 ~ppc"
63 IUSE="zlib"
64
65 RDEPEND="x11-libs/libX11
66 x11-libs/libXpm"
67 DEPEND="${RDEPEND}
68 x11-misc/imake
69 x11-proto/xproto
70 media-gfx/imagemagick
71 app-text/gv
72 sys-apps/less
73 >=sys-apps/sed-4
74 zlib? ( sys-libs/zlib )"
75
76 src_unpack() {
77 unpack ${A}
78 rm -rf "${S}"
79 mv "${WORKDIR}"/${PN}-${FULL_DIST} "${S}"
80 unpack ${A}
81 epatch "${FILESDIR}"/${P}-Makefile.kit.patch \
82 "${FILESDIR}"/${P}-as-needed.patch
83 cd "${S}"/editkit && xmkmf || die
84 }
85
86 src_compile() {
87 use zlib || sed -i 's/-DZLIB\|-lz//g' Makefile.noimake || die
88
89 sed -e 's,^\(X11DIR=\).*,\1/usr/,g' \
90 -e 's,^\(EDITOR=\).*,\1less,g' \
91 -e 's,^\(SHAREDIR=\).*,\1/usr/share/xrmap,g' \
92 -e 's,^\(CCOPTIONS=\)-O6 -g,\1${CFLAGS},g' Makefile.noimake > Makefile || die
93
94 sed -i -e 's,^\(#define RCFILE \)SHAREDIR\",\1\"/etc/xrmap,g' \
95 -e 's,^\(#define SHAREDIR \"/usr/share/\),\1x,g' xrmap.h || die
96 emake || die
97 cd tools
98 emake || die
99 cd jpd2else
100 sed -i 's,^\(#define DEFAULT_JPD_FILE \"/usr/share/\),\1x,g' jpd2else.c || die
101 emake || die
102 cd ../cbd2else
103 emake || die
104 }
105
106 src_install() {
107 dobin xrmap tools/preproc tools/jpd2else/jpd2else tools/cbd2else/cbd2else || die
108 dodir /usr/share/${PN}/ || die
109 dodir /etc/xrmap || die
110 cp -r {i18n,Locations,factbook,anthems,flags,hymns,pixmaps} "${D}"/usr/share/${PN}/ || die
111 cp Xrmaprc "${D}"/etc/xrmap || die
112 cp "${WORKDIR}"/CIA_WDB2.jpd "${D}"/usr/share/${PN}/ || die
113 dodoc CHANGES README TODO WARNING tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
114
115 cd "${S}"
116 newman xrmap.man xrmap.1 || die "newman failed"
117 }