Locales do not use DATADIR corretly, and thus install to /share, and not

/usr/share, bug #26384.

5 files changed, 94 insertions, 4 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index e2d3fce65fdc..2259f91f72c1 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.18 2003/08/08 01:40:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.19 2003/09/23 23:43:09 azarah Exp $
+
+*kbd-1.08-r3 (24 Sep 2003)
+
+  24 Sep 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r3.ebuild,
+  files/kbd-1.08-po-install-locations.patch:
+  Locales do not use DATADIR corretly, and thus install to /share, and not
+  /usr/share, bug #26384.
 
 *kbd-1.08-r2 (02 Aug 2003)
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 02d02bcf6f4f..514512a1d246 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,7 +1,6 @@
 MD5 4d1107e85a92f48d767d57651efeee83 kbd-1.08-r2.ebuild 1550
-MD5 77129a6dc6042110fe8aeba43aaf2023 kbd-1.08-r3.ebuild 1706
-MD5 db3677ba03e303d8b748db874bbb59b9 ChangeLog 3118
-MD5 4e0eaffb29458351add68abb05f1b9dd .kbd-1.08-r3.ebuild.swp 12288
+MD5 5554e78210a3583186e0b3fbe4f1a8f3 kbd-1.08-r3.ebuild 1707
+MD5 6fe1f61923c24600e78247ff9a456a05 ChangeLog 3363
 MD5 4cc908e158d84eddfb6e9a67133938e7 kbd-1.08-r1.ebuild 1549
 MD5 17b0176ba7f61c6ee4b2aa69e47580d3 kbd-1.06-r1.ebuild 1122
 MD5 9dde9067630b0fb27bd8224753741463 files/kbd-1.08-sparc-fixes.patch 2375
diff --git a/sys-apps/kbd/files/digest-kbd-1.08-r3 b/sys-apps/kbd/files/digest-kbd-1.08-r3
new file mode 100644
index 000000000000..9b77d0dd0db3
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.08-r3
@@ -0,0 +1 @@
+MD5 924e6a05e52715dc0f96385b35f2f680 kbd-1.08.tar.gz 819924
diff --git a/sys-apps/kbd/files/kbd-1.08-po-install-locations.patch b/sys-apps/kbd/files/kbd-1.08-po-install-locations.patch
new file mode 100644
index 000000000000..6b7034caddab
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.08-po-install-locations.patch
@@ -0,0 +1,16 @@
+--- kbd-1.08/po/Makefile.orig	2003-09-24 01:29:39.746716112 +0200
++++ kbd-1.08/po/Makefile	2003-09-24 01:30:12.907674880 +0200
+@@ -15,10 +15,10 @@
+ SHELL = /bin/sh
+ 
+ prefix = ${DESTDIR}
+-datadir = $(prefix)/share
++datadir = $(DATADIR)
+ localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
+-gettextsrcdir = $(prefix)/share/gettext/po
++gnulocaledir = $(datadir)/locale
++gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = /usr/bin/install -c
+ INSTALL_DATA = ${INSTALL} -m 644
diff --git a/sys-apps/kbd/kbd-1.08-r3.ebuild b/sys-apps/kbd/kbd-1.08-r3.ebuild
new file mode 100644
index 000000000000..4f127bca5f67
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.08-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.08-r3.ebuild,v 1.1 2003/09/23 23:43:09 azarah Exp $
+
+IUSE="nls"
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Keyboard and console utilities"
+SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.tar.gz
+	ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/${P}.tar.gz"
+HOMEPAGE="http://freshmeat.net/projects/kbd/"
+
+KEYWORDS="~x86 ~amd64 -ppc ~sparc ~alpha ~mips ~hppa ~arm ia64"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
+PROVIDE="sys-apps/console-tools"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Fixes makefile so that it uses the CFLAGS from portage (bug #21320).
+	sed -i -e "s:-O2:${CFLAGS}:g" src/Makefile.in
+
+	# Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'.
+	epatch ${FILESDIR}/${P}-kbd_repeat.patch
+
+	# Locales do not use DATADIR corretly, and thus install to /share, and
+	# not /usr/share, bug #26384.
+	epatch ${FILESDIR}/${P}-po-install-locations.patch
+}
+
+src_compile() {
+	local myconf=
+
+	# Non-standard configure script; --disable-nls to
+	# disable NLS, nothing to enable it.
+	use nls || myconf="--disable-nls"
+
+	# We should not add the prefix to mandir and datadir
+	./configure --prefix=/usr \
+		--mandir=/share/man \
+		--datadir=/share \
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		DATADIR=${D}/usr/share \
+		MANDIR=${D}/usr/share/man \
+		install || die
+
+	dodir /usr/bin
+	dosym ../../bin/setfont /usr/bin/setfont
+
+	dodoc CHANGES CREDITS COPYING README
+	dodir /usr/share/doc/${PF}/html
+	cp -dR doc/* ${D}/usr/share/doc/${PF}/html/
+}
+