Version bump. Fixes bug #309661

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 115 insertions, 2 deletions

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index cfb84b1b74cb..4e64172d61e6 100644
--- a/x11-misc/xrmap/ChangeLog
+++ b/x11-misc/xrmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xrmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.16 2010/02/06 21:14:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.17 2010/05/28 21:10:03 hwoarang Exp $
+
+*xrmap-2.33 (28 May 2010)
+
+  28 May 2010; Markos Chandras <hwoarang@gentoo.org> +xrmap-2.33.ebuild:
+  Version bump. Fixes bug #309661
 
   06 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> xrmap-2.32.ebuild,
   +files/xrmap-2.32-asneeded.patch:
diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index ca75f0f28c76..616ecf2bb7b3 100644
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -1,10 +1,14 @@
 AUX xrmap-2.32-Makefile.kit.patch 750 RMD160 520dd023635430506d8c4c4c01a5fa366cf134aa SHA1 4200764cd4db2ae821997fda913c855c2a767064 SHA256 139784b2180e404e9265352fecad131ae535288dddb91b6fe7487095e6d41328
 AUX xrmap-2.32-asneeded.patch 540 RMD160 3e16c8751717730f6e9eb29c9934f7b7c8ddc9fc SHA1 71c82620f0bc245ad8e4a6a5831e979b9252d929 SHA256 a486e3e3fa54fe9f2463c2297bfb8471a2dc9ff3224cecc9d0302aa76c42a776
+AUX xrmap-2.33-Makefile.kit.patch 701 RMD160 97661e2d5e7d5e34db533f66bd3eb6373d4f900a SHA1 01393e37ee1ef8a0dc59415589ad89fcf531493f SHA256 839a5672acd290d24aee62de2ecb30aee584cff7ea7475ef95d778a9ad9125b6
+AUX xrmap-2.33-as-needed.patch 564 RMD160 3760717e2478cab2d2cec0afb26e903480906e31 SHA1 0e5009b2556e3ffcdd8ef102b6191dd0c4aa19f2 SHA256 54ec3017ca34a4a195b79555e0dfe4d2e04df7c80782a52e3719b90745217c86
 DIST CIA_WDB2.jpd.gz 7391060 RMD160 80fe751ba61405d7b7b7ecdfaf3a9d8e7b9e06b8 SHA1 5d5695c21059dce13ede1f7d5c2a4dfe19b52dd2 SHA256 6bd5c4dc9b31814fdd724563ad27a5a08484d2e8b4f410f8a3a6941491dc13e1
 DIST xrmap-2.10.tgz 3944521 RMD160 dd398b2e4b24c23b1fbf9edfa37ddf7d1f4eaf65 SHA1 234a3272e5433865ce7e41c0ed663e17c0fa0f6d SHA256 dcc7383064ca03f4bbc097863cc0e54572c7b0c586461f222cfa7a14848acd6c
 DIST xrmap-2.29.tar.bz2 1072241 RMD160 f8cacc343643a66c8236743c76c80d3c33c44c5c SHA1 af2efc47b7ef76840a72a96e67174b0fd5dd8973 SHA256 2c790904c5077940b8e4b23d848b0e6a02757cde18a3256c47f34da7d7ae31d0
 DIST xrmap-2.32.tar.bz2 1133345 RMD160 5f981cd7e05046d97833bdbf48cf983d3a87d0fe SHA1 30838b29801f8dbf018cf02831e29fd4054ef109 SHA256 842364b5fbe73a4c4573a828a5bc6f492bb9809694ad1dcc16cb29fb8dc2c184
+DIST xrmap-2.33.tar.bz2 1224699 RMD160 6c025976f98046315a370405f043aaf2cd05a12d SHA1 bd6392e1732754f5421615ff16ef625e703fbb5b SHA256 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440
 EBUILD xrmap-2.29.ebuild 2112 RMD160 1b9f33e54013a4c7ed06c1a0550b9c716f815549 SHA1 fc79529380a944b5585c1655be573511a4cca5df SHA256 bd641e18421edc15bd9f3e439cd97f83c38eef3b1d285ebac970bdff29be6d32
 EBUILD xrmap-2.32.ebuild 2212 RMD160 a5f763b09db009d16b16a7aec37818f5b2b41889 SHA1 14111437745786eb48b72c48a5c02d663a643fa3 SHA256 1db50a05d9b08a2bd68c7fb1d784ea623e7029bab3f49a4d4841a4a6adb00367
-MISC ChangeLog 2094 RMD160 bb8317c753629437b799a17386028661c87b0440 SHA1 738489924ac22442b9c72f3615cea19e5aec946b SHA256 8ed0e33483372348c86d9bd66a6f043125caa14c2260c6688f6bd0d5207b0c62
+EBUILD xrmap-2.33.ebuild 2212 RMD160 17715efc211f4d9c849bd836e5d4ecea47147a9b SHA1 e44e90af5884df9e21307e572a81ab5c318f5679 SHA256 531321e5a691f24c782774109eb34552c2cf8e123ff9ab4124b8177959641d04
+MISC ChangeLog 2228 RMD160 1dc84686eb0edf21154d8d8a3eda0e89ba66aae0 SHA1 6b0c11b5f11a205bc2a3565729fa8f33c657a45c SHA256 944d84a46cfb5dbe84620744cff6c0a2a329bed7081510441379288532a9d80e
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch b/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch
new file mode 100644
index 000000000000..9cf26c7551cb
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch
@@ -0,0 +1,20 @@
+Index: xrmap-2.33/editkit/Makefile.kit
+===================================================================
+--- xrmap-2.33.orig/editkit/Makefile.kit
++++ xrmap-2.33/editkit/Makefile.kit
+@@ -15,13 +15,14 @@
+ 
+ SHAREDIR=/usr/share/editkit
+ 
+-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
++CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -DSHAREDIR="\"$(SHARE_DIR)\""
+ 
+ #CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL
+ 
+ #CFLAGS = -g -pipe
+ 
+ TLIBS = -L/usr/lib -ltermcap
++TLIBS = -L/usr/lib -lcurses
+ XLIBS = -L/usr/X11R6/lib -lX11
+ 
+ # Use this for solaris
diff --git a/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch b/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch
new file mode 100644
index 000000000000..82f29f5e3e8a
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch
@@ -0,0 +1,13 @@
+Index: xrmap-2.33/Makefile.noimake
+===================================================================
+--- xrmap-2.33.orig/Makefile.noimake
++++ xrmap-2.33/Makefile.noimake
+@@ -20,7 +20,7 @@ LDOPTIONS=-O6 -g -Wall  -lXpm -lX11 -ljp
+ ## LDOPTIONS=-O6 -g -Wall libxpm/libXpm.a -lX11 -lz -lm -L/usr/X11R6/lib
+ 
+ all: explorer.o image.o xrmap.o
+-	gcc $(LDOPTIONS) -o xrmap explorer.o image.o xrmap.o
++	gcc -o xrmap explorer.o image.o xrmap.o $(LDOPTIONS)
+ 	cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR)
+ 	cd earthview ; make DESTDIR=$(DESTDIR)	
+ 	@cat EXTRADATA
diff --git a/x11-misc/xrmap/xrmap-2.33.ebuild b/x11-misc/xrmap/xrmap-2.33.ebuild
new file mode 100644
index 000000000000..29fc42dec2e0
--- /dev/null
+++ b/x11-misc/xrmap/xrmap-2.33.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.1 2010/05/28 21:10:03 hwoarang Exp $
+
+inherit eutils
+
+DESCRIPTION="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_"
+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"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="zlib"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	x11-proto/xproto
+	media-gfx/imagemagick
+	app-text/gv
+	sys-apps/less
+	>=sys-apps/sed-4
+	zlib? ( sys-libs/zlib )"
+
+src_unpack() {
+	unpack ${A}
+	rm -rf "${S}"
+	mv "${WORKDIR}"/${PN}-${FULL_DIST} "${S}"
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-Makefile.kit.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
+	cd "${S}"/editkit && xmkmf || die
+}
+
+src_compile() {
+	use zlib || sed -i 's/-DZLIB\|-lz//g' Makefile.noimake || die
+
+	sed  -e 's,^\(X11DIR=\).*,\1/usr/,g' \
+		 -e 's,^\(EDITOR=\).*,\1less,g'   \
+		 -e 's,^\(SHAREDIR=\).*,\1/usr/share/xrmap,g' \
+		 -e 's,^\(CCOPTIONS=\)-O6 -g,\1${CFLAGS},g' Makefile.noimake > Makefile || die
+
+	sed -i -e 's,^\(#define RCFILE \)SHAREDIR\",\1\"/etc/xrmap,g'  \
+		   -e 's,^\(#define SHAREDIR \"/usr/share/\),\1x,g' xrmap.h || die
+	emake || die
+	cd tools
+	emake || die
+	cd jpd2else
+	sed -i 's,^\(#define DEFAULT_JPD_FILE \"/usr/share/\),\1x,g' jpd2else.c || die
+	emake || die
+	cd ../cbd2else
+	emake || die
+}
+
+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,pixmaps} "${D}"/usr/share/${PN}/ || die
+	cp Xrmaprc "${D}"/etc/xrmap || die
+	cp "${WORKDIR}"/CIA_WDB2.jpd "${D}"/usr/share/${PN}/ || die
+	dodoc CHANGES README TODO WARNING tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
+
+	cd "${S}"
+	newman xrmap.man xrmap.1 || die "newman failed"
+}