diff options
| author |   Markus Nigbur <pyrania@gentoo.org> | 2004-08-27 10:55:25 +0000 |
|---|---|---|
| committer | Markus Nigbur <pyrania@gentoo.org> | 2004-08-27 10:55:25 +0000 |
| commit | 28284bb232c55a8b8ed258cf670f64aa86a64714 (patch) | |
| tree | a0bdc63736146a4722ea06ea048a30465d83d103 /x11-misc | |
| parent | See bug 61131 (Manifest recommit) (diff) | |
| download | gentoo-2-28284bb232c55a8b8ed258cf670f64aa86a64714.tar.gz gentoo-2-28284bb232c55a8b8ed258cf670f64aa86a64714.tar.bz2 gentoo-2-28284bb232c55a8b8ed258cf670f64aa86a64714.zip | |
Fixing bug #56225. Thanks to James Leddy and Alexandre Veyrenc.
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xrmap/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-misc/xrmap/metadata.xml | 5 | ||||
| -rw-r--r-- | x11-misc/xrmap/xrmap-2.29.ebuild | 16 |
3 files changed, 22 insertions, 4 deletions
diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog index 55d09e178a1c..a62b0f3806de 100644 --- a/x11-misc/xrmap/ChangeLog +++ b/x11-misc/xrmap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-misc/xrmap # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.5 2004/08/14 14:57:28 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.6 2004/08/27 10:55:25 pyrania Exp $ + + 27 Aug 2004; <pyrania@gentoo.org> +metadata.xml, xrmap-2.29.ebuild: + Fixing bug #56225. Thanks to James Leddy and Alexandre Veyrenc. 14 Aug 2004; Sven Wegener <swegener@gentoo.org> xrmap-2.10.ebuild, xrmap-2.29.ebuild: diff --git a/x11-misc/xrmap/metadata.xml b/x11-misc/xrmap/metadata.xml new file mode 100644 index 000000000000..731225048652 --- /dev/null +++ b/x11-misc/xrmap/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>desktop-misc</herd> +</pkgmetadata> diff --git a/x11-misc/xrmap/xrmap-2.29.ebuild b/x11-misc/xrmap/xrmap-2.29.ebuild index 4452337b29ed..6006402aab9c 100644 --- a/x11-misc/xrmap/xrmap-2.29.ebuild +++ b/x11-misc/xrmap/xrmap-2.29.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.29.ebuild,v 1.2 2004/08/14 14:57:28 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.29.ebuild,v 1.3 2004/08/27 10:55:25 pyrania Exp $ DESCRIPTION="The Xrmap program is a X client for generating images of the Earth and manipulating the CIA World data bank" HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_" -SRC_URI="ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${P}.tar.bz2 +FULL_DIST="2.10" +SRC_URI="ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${PN}-${FULL_DIST}.tgz + ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${P}.tar.bz2 ftp://ftp.ac-grenoble.fr/ge/geosciences/CIA_WDB2.jpd.gz" LICENSE="GPL-2" @@ -18,6 +20,14 @@ DEPEND="media-gfx/imagemagick >=sys-apps/sed-4 zlib? ( sys-libs/zlib )" +src_unpack() { + unpack ${A} + rm -rf ${S} + mv ${WORKDIR}/${PN}-${FULL_DIST} ${S} + unpack ${A} + cd ${S}/editkit && xmkmf || die +} + src_compile() { use zlib || sed -i 's/-DZLIB\|-lz//g' Makefile.noimake || die @@ -42,7 +52,7 @@ src_install() { dobin xrmap tools/preproc tools/jpd2else/jpd2else tools/cbd2else/cbd2else || die dodir /usr/share/${PN}/ || die dodir /etc/xrmap || die - cp -r {i18n,Locations,factbook,anthems,flags,hymns} ${D}/usr/share/${PN}/ || die + cp -r {i18n,Locations,factbook,anthems,flags,hymns,pixmaps} ${D}/usr/share/${PN}/ || die cp Xrmaprc ${D}/etc/xrmap || die cp ${WORKDIR}/CIA_WDB2.jpd ${D}/usr/share/${PN}/ || die dodoc CHANGES COPYING README TODO WARNING tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die |