From 04e08196e0437eb084dd483a07ffd445678c3735 Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sat, 28 Aug 2010 21:24:37 +0000 Subject: Fix compilation problems with make 3.82 (bug #334713), switch to EAPI 2, respect LDFLAGS. (Portage version: 2.1.8.3/cvs/Linux x86_64) --- app-misc/linux-logo/ChangeLog | 9 ++- .../files/linux_logo-5.10-makefile-tabs.patch | 19 ++++++ app-misc/linux-logo/linux-logo-5.10-r1.ebuild | 72 ++++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 app-misc/linux-logo/files/linux_logo-5.10-makefile-tabs.patch create mode 100644 app-misc/linux-logo/linux-logo-5.10-r1.ebuild (limited to 'app-misc') 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 + +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/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 +} -- cgit v1.2.3-65-gdbad