Fix compilation problems with make 3.82 (bug #334713), switch to EAPI 2, respect LDFLAGS.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 106 insertions, 6 deletions

diff --git a/app-misc/linux-logo/ChangeLog b/app-misc/linux-logo/ChangeLog
index 47e9cea70cd7..fe48cb640463 100644
--- a/app-misc/linux-logo/ChangeLog
+++ b/app-misc/linux-logo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/linux-logo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.66 2010/07/05 10:38:08 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.67 2010/08/28 21:24:37 spock Exp $
+
+*linux-logo-5.10-r1 (28 Aug 2010)
+
+  28 Aug 2010; Michał Januszewski <spock@gentoo.org>
+  +linux-logo-5.10-r1.ebuild, +files/linux_logo-5.10-makefile-tabs.patch:
+  Fix compilation problems with make 3.82 (bug #334713), switch to EAPI 2,
+  respect LDFLAGS.
 
 *linux-logo-5.10 (05 Jul 2010)
 
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index 340b74c92fc0..6ba0d05c124e 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -5,6 +5,7 @@ AUX gentoo.logo 4732 RMD160 6321307167d956732cbfb6d52faf5f1252ffeef1 SHA1 250f09
 AUX gentoo2.logo 1640 RMD160 3797e98df403337ff805786bd15be13421558bc2 SHA1 d23566479591aaab49a8eaefedb603eec4642193 SHA256 2f9cda11a31e93873b424b5499437ffa3c3ae9e348f440e9ac14972c15df7850
 AUX linux-logo.conf 1213 RMD160 8df7fea63cb0e2531d638783d9513595216711a5 SHA1 62b13288453078ad56cc03e437b70fff3224fa23 SHA256 054ebe197d7f6c34c0e6245b1e9113384d6da16654c04ad8a8da3ed6b50ced4f
 AUX linux-logo.initscript 449 RMD160 4b0f6aa66075e257a068b0ff467eed7e25b6aa0a SHA1 ca42ff6331c632d41b4211fb6c70becc9fe2a0b4 SHA256 73ae9e7fe5136786f3a6d7826c3f99a5790964f7c720daf99ad1f19bcf8990e6
+AUX linux_logo-5.10-makefile-tabs.patch 628 RMD160 4121c401bbfbdd43ae726d7373499a45306e7fda SHA1 0835fd74bd668387f018f90d71b3b3446455f071 SHA256 c16dd460f745228611a4058b2b26f07fbb6244b22e32b33f43438bac0221d1f5
 DIST linux_logo-5.02.tar.gz 97279 RMD160 ff1ff3b7576e9873778d21d9bb8d19b14604b693 SHA1 36ebc75d11851e73f0776f64051e22763a023d8c SHA256 9932ab41b32a270f590890d515119456671814bdd6e4f4481a276cdfb5494690
 DIST linux_logo-5.03.tar.gz 96562 RMD160 d11e23faf90a46a9ba85f418934f27fa493ed508 SHA1 b254b2d2fe803c90f4a0f662d2eba3f68717fbfe SHA256 654818fda72162322d86203303335d4293d68b25149a464f99ca9390ae4fd0b8
 DIST linux_logo-5.04.tar.gz 97082 RMD160 fbb897faefc9e166b9c13b6529295b59af1e7f80 SHA1 6cb795044f101414b1ab462efc9a015e329fa4d1 SHA256 49bfbe9fbec959cb8cade395e0af5e20249d9e9c49c4bbb2f3ca0da476a4143a
@@ -16,13 +17,14 @@ EBUILD linux-logo-5.03.ebuild 2066 RMD160 4f776a0a401ce42f2586c9fcf66b5498551cae
 EBUILD linux-logo-5.04.ebuild 2071 RMD160 40ca9898197657fc786774b66cb0572d8017d847 SHA1 e91c98065e03b87ca875241506cb9e16bafca44b SHA256 deb23fb6147d2077344dc08822cf383dd366817334cfd615ce377b56a39703a5
 EBUILD linux-logo-5.06.ebuild 2079 RMD160 04f1a3ee36e8d1e1afa1c966e09595ed3779c6d0 SHA1 33f079cc81fa632f458ea0b71c77db0aa59e896a SHA256 4dab191e3d83246201214557f7511cc25fc215bb84c53e9726b8543420b360cf
 EBUILD linux-logo-5.07.ebuild 2079 RMD160 64824c1763d19053f5f46ab0072ecbec5e882673 SHA1 8d3d20e43bbf9063c9bf65b4fa8824291885fb34 SHA256 f0c6d7601ea508e332388c1e0b4677dec524acdc73ebe978e107639c6b612150
+EBUILD linux-logo-5.10-r1.ebuild 2190 RMD160 179151242ab4085b9b3a48c9fe2e7ceed5dad79a SHA1 f659ad0c0714e7e5ca4576f73f047e68182264c0 SHA256 64dbc515bdcaa260cda29a6ce9ee7445a9141e708f382d2329fd7b517eb88a1b
 EBUILD linux-logo-5.10.ebuild 2079 RMD160 de2862194d2fbe685b01d424564c5c1c01644272 SHA1 3124e2be0e0db2110c22675566309b564d9a2998 SHA256 f594d157bd3b71f1fc6edb7d283ca82550d8c5a290e8f31b3ff9311bddb23a38
-MISC ChangeLog 9428 RMD160 d8c3b4b8625364c08c3d150dab477e0418a70f5d SHA1 13fbe8f3b399d8e9d37fc69a6cdcef31a693e87b SHA256 8f5b6184fada5b1b1e9f8246d3ed2759d0d20e3dc694ba3626afa135238d20a5
+MISC ChangeLog 9686 RMD160 9fb03e30f52e560d0531ad1950dfa2bd829171af SHA1 fcdfd33501406fd9cd7cd2ca0b7f3b2b9d77b127 SHA256 bb5a608e46ede612761a2ac2d9fc0c1a8483ecc9758dc8be253bbde2c406e340
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwxth4ACgkQchej4aZK9/fwogCeKgcUps1UsdPvs4OLza030qlV
-zzoAnjCW3pnyD1HdsKnrjLlD3hEs6o9o
-=bWd7
+iEYEARECAAYFAkx5fp8ACgkQchej4aZK9/dGegCfaqMASDXUFwxmfTJKnj63Alj0
+oJ0AnjK23sG5HP/onm9OnfbKKUgrD9QP
+=RU37
 -----END PGP SIGNATURE-----
diff --git a/app-misc/linux-logo/files/linux_logo-5.10-makefile-tabs.patch b/app-misc/linux-logo/files/linux_logo-5.10-makefile-tabs.patch
new file mode 100644
index 000000000000..d103feb1a288
--- /dev/null
+++ b/app-misc/linux-logo/files/linux_logo-5.10-makefile-tabs.patch
@@ -0,0 +1,19 @@
+diff -Naurp linux_logo-5.10-orig//po/Makefile linux_logo-5.10/po/Makefile
+--- linux_logo-5.10-orig//po/Makefile	2010-08-28 23:07:37.839925950 +0200
++++ linux_logo-5.10/po/Makefile	2010-08-28 23:12:49.077926707 +0200
+@@ -32,9 +32,9 @@ install: $(CATALOGS)
+ 	msgfmt -o $@ $< 
+ 
+ update: $(PACKAGE).pot
+-       for n in $(CATALOGS); do \
+-       l=basename $$n .mo; \
+-       l=$$l".po";\
+-       mv -f $$l $$l".bac";\
+-       msgmerge -o $$l $$l".bac" $(PACKAGE).pot; \
+-       done
++	for n in $(CATALOGS); do \
++	l=`basename $$n .mo`; \
++	l=$$l".po";\
++	mv -f $$l $$l".bac";\
++	msgmerge -o $$l $$l".bac" $(PACKAGE).pot; \
++	done
diff --git a/app-misc/linux-logo/linux-logo-5.10-r1.ebuild b/app-misc/linux-logo/linux-logo-5.10-r1.ebuild
new file mode 100644
index 000000000000..6a0db2564ee8
--- /dev/null
+++ b/app-misc/linux-logo/linux-logo-5.10-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.10-r1.ebuild,v 1.1 2010/08/28 21:24:37 spock Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN/-/_}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
+HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
+SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	echo "./logos/gentoo.logo" >> logo_config
+	echo "./logos/gentoo2.logo" >> logo_config
+	echo "./logos/banner-simplified.logo" >> logo_config
+	echo "./logos/banner.logo" >> logo_config
+	echo "./logos/classic-no_periods.logo" >> logo_config
+	echo "./logos/classic-no_periods_or_chars.logo" >> logo_config
+	echo "./logos/classic.logo" >> logo_config
+	cp "${FILESDIR}"/gentoo{,2}.logo "${S}"/logos/
+	echo "NAME gentoo" >> "${S}"/logos/gentoo.logo
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/linux_logo-5.10-makefile-tabs.patch
+}
+
+src_compile() {
+	ARCH="" ./configure --prefix="${D}"/usr || die
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	make install || die
+
+	dodoc BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ
+
+	cp "${FILESDIR}"/${PN}.conf "${WORKDIR}"
+	sed -i -e 's/-L 4 -f -u/-f -u/' "${WORKDIR}"/${PN}.conf
+
+	newinitd "${FILESDIR}"/${PN}.initscript ${PN}
+	newconfd "${WORKDIR}"/${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
+	elog ""
+	elog "To display the first Gentoo logo type: linux_logo -L gentoo"
+	elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
+	elog "To display all the logos available type: linux_logo -L list."
+	elog ""
+	elog "To start linux_logo on boot, please type:"
+	elog "   rc-update add linux-logo default"
+	elog "which uses the settings found in"
+	elog "   /etc/conf.d/linux-logo"
+	echo
+}