Respect users' ${GZIP} setting; bug #71974.

Package-Manager: portage-2.0.51-r15

5 files changed, 13 insertions, 36 deletions

diff --git a/media-fonts/x11fonts-jmk/ChangeLog b/media-fonts/x11fonts-jmk/ChangeLog
index 5bf67575f533..79ff84a00db6 100644
--- a/media-fonts/x11fonts-jmk/ChangeLog
+++ b/media-fonts/x11fonts-jmk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/x11fonts-jmk
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/x11fonts-jmk/ChangeLog,v 1.6 2004/09/29 17:49:26 gustavoz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/x11fonts-jmk/ChangeLog,v 1.7 2005/02/20 11:56:27 usata Exp $
+
+  20 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> x11fonts-jmk-3.0-r1.ebuild,
+  -x11fonts-jmk-3.0.ebuild:
+  Respect users' ${GZIP} setting; bug #71974.
 
   29 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   x11fonts-jmk-3.0-r1.ebuild:
diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index 8991b8dd5a46..d7e93c2f6472 100644
--- a/media-fonts/x11fonts-jmk/Manifest
+++ b/media-fonts/x11fonts-jmk/Manifest
@@ -1,6 +1,4 @@
-MD5 95d8383fac14b5c9f8f018c9ce49e011 ChangeLog 1389
+MD5 71d4d20976dd1acf5d93211ceae07393 ChangeLog 1538
+MD5 ac767e7d4c44934801f0ef5889e38ec9 x11fonts-jmk-3.0-r1.ebuild 791
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
-MD5 438c9229382ac632e65147f7f0b136c8 x11fonts-jmk-3.0-r1.ebuild 734
-MD5 0a7802bf7c4d83f29e9edd130dd529e9 x11fonts-jmk-3.0.ebuild 687
-MD5 55def5813a5ef8bd6ce0a466a5b12b67 files/digest-x11fonts-jmk-3.0 69
 MD5 55def5813a5ef8bd6ce0a466a5b12b67 files/digest-x11fonts-jmk-3.0-r1 69
diff --git a/media-fonts/x11fonts-jmk/files/digest-x11fonts-jmk-3.0 b/media-fonts/x11fonts-jmk/files/digest-x11fonts-jmk-3.0
deleted file mode 100644
index 5b9ddd3b1bb2..000000000000
--- a/media-fonts/x11fonts-jmk/files/digest-x11fonts-jmk-3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c699d69c02a306b9148d9148b6dace2 jmk-x11-fonts-3.0.tar.gz 624357
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
index 067ebc19cd2e..ba0455ba5048 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild,v 1.6 2004/09/29 17:49:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild,v 1.7 2005/02/20 11:56:27 usata Exp $
 
 MY_P=jmk-x11-fonts-${PV}
 S=${WORKDIR}/${MY_P}
@@ -19,6 +19,9 @@ FONTPATH="/usr/share/fonts/jmk"
 
 src_compile() {
 
+	local GZIP_OPTS="${GZIP}"
+	local GZIP="gzip ${GZIP_OPTS}"
+
 	xmkmf || die
 	emake || die
 }
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0.ebuild
deleted file mode 100644
index b059ef5de039..000000000000
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0.ebuild,v 1.4 2004/07/14 17:11:24 agriffis Exp $
-
-MY_P=jmk-x11-fonts-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="This package contains character-cell fonts for use with X."
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jmknoble.net/fonts/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_compile() {
-	xmkmf || die
-
-	emake || die
-}
-
-src_install() {
-	make install INSTALL_DIR='${D}/usr/X11R6/lib/X11/fonts/jmk' || die
-
-	dodoc README NEWS
-}