nls support + a new logo added

9 files changed, 89 insertions, 95 deletions

diff --git a/app-misc/linux_logo/Manifest b/app-misc/linux_logo/Manifest
index 6e269e04208e..5687b6485364 100644
--- a/app-misc/linux_logo/Manifest
+++ b/app-misc/linux_logo/Manifest
@@ -1,6 +1,6 @@
-MD5 3f75304b5abcd63a64ff780215ab0893 linux_logo-4.07-r1.ebuild 1400
+MD5 511d54fb50ffd3e7b7baf16f4ab3700e linux_logo-4.07-r1.ebuild 1407
 MD5 b4c5339fb4c1da38c44581c173d5aa30 linux_logo-4.07.ebuild 1086
-MD5 909ca290741e9785244b018c496ffacb ChangeLog 1554
+MD5 11bd3f8f67457397f7b713f394e4b53b ChangeLog 1559
 MD5 6c88e72ae5d2b3b6a9c268c326663956 files/digest-linux_logo-4.07 66
 MD5 466609d5bad726de258ba8d9a6307f42 files/linux-logo-4.07-gentoo-logo.patch 2450
 MD5 6c88e72ae5d2b3b6a9c268c326663956 files/digest-linux_logo-4.07-r1 66
diff --git a/app-misc/linux_logo/files/digest-linux_logo-4.02 b/app-misc/linux_logo/files/digest-linux_logo-4.02
deleted file mode 100644
index cc5608b6ebb8..000000000000
--- a/app-misc/linux_logo/files/digest-linux_logo-4.02
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82cc2adcfeb537e30bbc79d9d9e0697a linux_logo-4.02.tar.gz 88439
diff --git a/app-misc/linux_logo/files/digest-linux_logo-4.05 b/app-misc/linux_logo/files/digest-linux_logo-4.05
deleted file mode 100644
index 66cb1aef03de..000000000000
--- a/app-misc/linux_logo/files/digest-linux_logo-4.05
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f16f814b8504ef97db73062046e2e4b1 linux_logo-4.05.tar.gz 82244
diff --git a/app-misc/linux_logo/files/digest-linux_logo-4.05-r1 b/app-misc/linux_logo/files/digest-linux_logo-4.05-r1
deleted file mode 100644
index 66cb1aef03de..000000000000
--- a/app-misc/linux_logo/files/digest-linux_logo-4.05-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f16f814b8504ef97db73062046e2e4b1 linux_logo-4.05.tar.gz 82244
diff --git a/app-misc/linux_logo/files/digest-linux_logo-4.07-r1 b/app-misc/linux_logo/files/digest-linux_logo-4.07-r1
new file mode 100644
index 000000000000..55a83a139756
--- /dev/null
+++ b/app-misc/linux_logo/files/digest-linux_logo-4.07-r1
@@ -0,0 +1 @@
+MD5 9c6925cee70c6536995a0c64c790c1b5 linux_logo-4.07.tar.gz 85910
diff --git a/app-misc/linux_logo/files/linux-logo-4.07-gentoo-logo.patch b/app-misc/linux_logo/files/linux-logo-4.07-gentoo-logo.patch
new file mode 100644
index 000000000000..b89ec59baeb0
--- /dev/null
+++ b/app-misc/linux_logo/files/linux-logo-4.07-gentoo-logo.patch
@@ -0,0 +1,61 @@
+Status: Done
+
+Gentoo logo
+
+  Gentoo logo pulled from /etc/issue.logo, compiled in by default.
+
+
+ ----------- Diffstat output ------------
+ ./logo_config                     |    1 +
+ ./logos/distributions/gentoo.logo |   37 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+)
+
+diff ./logo_config~current~ ./logo_config
+--- ./logo_config~current~	2003-06-04 11:20:02.000000000 +0100
++++ ./logo_config	2003-06-04 11:20:02.000000000 +0100
+@@ -1,2 +1,3 @@
+ ./logos/banner.logo
+ ./logos/classic.logo
++./logos/distributions/gentoo.logo
+
+diff ./logos/distributions/gentoo.logo~current~ ./logos/distributions/gentoo.logo
+--- ./logos/distributions/gentoo.logo~current~	2003-06-04 11:20:02.000000000 +0100
++++ ./logos/distributions/gentoo.logo	2003-06-04 11:20:02.000000000 +0100
+@@ -0,0 +1,37 @@
++# Gentoo Logo
++# Added by James Rowe <Jay@jnrowe.uklinux.net>
++# Logo by 
++  
++SYSINFO_POSITION bottom
++  
++DESCRIPTION_STRING Gentoo Linux Logo
++
++BEGIN_LOGO
++
++
++                                            .
++      .vir.                                d$b
++   .d$$$$$$b.    .cd$$b.     .d$$b.   d$$$$$$$$$$$b  .d$$b.      .d$$b.
++   $$$$( )$$$b d$$$()$$$.   d$$$$$$$b Q$$$$$$$P$$$P.$$$$$$$b.  .$$$$$$$b.
++   Q$$$$$$$$$$B$$$$$$$$P"  d$$$PQ$$$$b.   $$$$.   .$$$P' `$$$ .$$$P' `$$$
++     "$$$$$$$P Q$$$$$$$b  d$$$P   Q$$$$b  $$$$b   $$$$b..d$$$ $$$$b..d$$$
++    d$$$$$$P"   "$$$$$$$$ Q$$$     Q$$$$  $$$$$   `Q$$$$$$$P  `Q$$$$$$$P
++|  $$$$$$$P       `"""""   ""        ""   Q$$$P     "Q$$$P"     "Q$$$P"
++|  `Q$$P"                                  """
+++--------------------------------------------------------- l  i  n  u  x  
++END_LOGO
++
++BEGIN_ASCII_LOGO
++
++
++                                            .
++      .vir.                                d$b
++   .d$$$$$$b.    .cd$$b.     .d$$b.   d$$$$$$$$$$$b  .d$$b.      .d$$b.
++   $$$$( )$$$b d$$$()$$$.   d$$$$$$$b Q$$$$$$$P$$$P.$$$$$$$b.  .$$$$$$$b.
++   Q$$$$$$$$$$B$$$$$$$$P"  d$$$PQ$$$$b.   $$$$.   .$$$P' `$$$ .$$$P' `$$$
++     "$$$$$$$P Q$$$$$$$b  d$$$P   Q$$$$b  $$$$b   $$$$b..d$$$ $$$$b..d$$$
++    d$$$$$$P"   "$$$$$$$$ Q$$$     Q$$$$  $$$$$   `Q$$$$$$$P  `Q$$$$$$$P
++|  $$$$$$$P       `"""""   ""        ""   Q$$$P     "Q$$$P"     "Q$$$P"
++|  `Q$$P"                                  """
+++--------------------------------------------------------- l  i  n  u  x  
++END_ASCII_LOGO
diff --git a/app-misc/linux_logo/linux_logo-4.02.ebuild b/app-misc/linux_logo/linux_logo-4.02.ebuild
deleted file mode 100644
index 32bb490c3991..000000000000
--- a/app-misc/linux_logo/linux_logo-4.02.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/linux_logo/linux_logo-4.02.ebuild,v 1.8 2003/02/13 09:05:17 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Displays an ansi or an ascii logo and some system information."
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${P}.tar.gz"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/" 
-
-DEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-src_unpack() { 
-	unpack ${A}
-	cd ${S}
-	gunzip linux_logo.1.gz
-	cp Makefile Makefile.orig
-	echo "./logos/gentoo.logo" >> logo_config
-	cp ${FILESDIR}/gentoo.logo ${S}/logos/.
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	dobin linux_logo
-	doman linux_logo.1
-	dodoc BUGS CHANGES COPYING README README.CUSTOM_LOGOS TODO USAGE
-	dodoc LINUX_LOGO.FAQ
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Linux_logo ebuild for Gentoo comes with a Gentoo logo."
-	einfo "To display it type: linux_logo -L 3"
-	einfo "To display all the logos available type: linux_logo -L list."
-}
diff --git a/app-misc/linux_logo/linux_logo-4.05.ebuild b/app-misc/linux_logo/linux_logo-4.05.ebuild
deleted file mode 100644
index 6f8aa0f5f7cf..000000000000
--- a/app-misc/linux_logo/linux_logo-4.05.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/linux_logo/linux_logo-4.05.ebuild,v 1.4 2003/02/13 09:05:22 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Displays an ansi or an ascii logo and some system information."
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${P}.tar.gz"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/" 
-
-DEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_unpack() { 
-	unpack ${A}
-	cd ${S}
-	gunzip linux_logo.1.gz
-	cp Makefile Makefile.orig
-	echo "./logos/gentoo.logo" >> logo_config
-	cp ${FILESDIR}/gentoo.logo ${S}/logos/.
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	dobin linux_logo
-	doman linux_logo.1
-	dodoc BUGS CHANGES COPYING README README.CUSTOM_LOGOS TODO USAGE
-	dodoc LINUX_LOGO.FAQ
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Linux_logo ebuild for Gentoo comes with a Gentoo logo."
-	einfo "To display it type: linux_logo -L 3"
-	einfo "To display all the logos available type: linux_logo -L list."
-}
diff --git a/app-misc/linux_logo/linux_logo-4.05-r1.ebuild b/app-misc/linux_logo/linux_logo-4.07-r1.ebuild
index a8d0e00c40be..b90d682853a8 100644
--- a/app-misc/linux_logo/linux_logo-4.05-r1.ebuild
+++ b/app-misc/linux_logo/linux_logo-4.07-r1.ebuild
@@ -1,25 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/linux_logo/linux_logo-4.05-r1.ebuild,v 1.1 2003/03/02 06:32:59 tad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux_logo/linux_logo-4.07-r1.ebuild,v 1.1 2003/06/07 23:12:04 seemant Exp $
+
+IUSE="nls"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Displays an ansi or an ascii logo and some system information."
 SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${P}.tar.gz"
 HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/" 
 
-DEPEND="virtual/glibc"
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
+DEPEND="virtual/glibc"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
 src_unpack() { 
 	unpack ${A}
 	cd ${S}
-	gunzip linux_logo.1.gz
-	cp Makefile Makefile.orig
 	echo "./logos/gentoo.logo" >> logo_config
 	cp ${FILESDIR}/gentoo.logo ${S}/logos/.
+
+	epatch ${FILESDIR}/${P}-gentoo-logo.patch
+
+	if [ -z "`use nls`" ]
+	then
+		sed -i 's:cd po && $(MAKE)::' Makefile
+	fi
 }
 
 src_compile() {
@@ -28,14 +37,22 @@ src_compile() {
 
 src_install() {
 	dobin linux_logo
-	doman linux_logo.1
+	doman linux_logo.1.gz
+	
 	dodoc BUGS CHANGES COPYING README README.CUSTOM_LOGOS TODO USAGE
 	dodoc LINUX_LOGO.FAQ
+
+	if use nls
+	then
+		dodir /usr/share/locale
+		make INSTALLDIR=${D}/usr/share/locale -C po install || die
+	fi
 }
 
 pkg_postinst() {
 	einfo
-	einfo "Linux_logo ebuild for Gentoo comes with a Gentoo logo."
-	einfo "To display it type: linux_logo -L 3"
+	einfo "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
+	einfo "To display the first Gentoo logo type: linux_logo -L 3"
+	einfo "To display the second Gentoo logo type: linux_logo -L 4"
 	einfo "To display all the logos available type: linux_logo -L list."
 }