diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-06-24 16:29:24 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-06-24 16:29:24 +0000 |
| commit | deb283d5bac6336f54ad0c5d3642e05701ee6c31 (patch) | |
| tree | b398505a4503505ad425fce3cdfef61465279501 /app-misc | |
| parent | alpha/ia64/m68k/s390/sh/sparc stable wrt #370649 (diff) | |
| download | gentoo-2-deb283d5bac6336f54ad0c5d3642e05701ee6c31.tar.gz gentoo-2-deb283d5bac6336f54ad0c5d3642e05701ee6c31.tar.bz2 gentoo-2-deb283d5bac6336f54ad0c5d3642e05701ee6c31.zip | |
Put logo_config in FILESDIR. Die more often. Move ./configure to src_configure().
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/linux-logo/ChangeLog | 7 | ||||
| -rw-r--r-- | app-misc/linux-logo/files/logo_config | 7 | ||||
| -rw-r--r-- | app-misc/linux-logo/linux-logo-5.11.ebuild | 21 |
3 files changed, 22 insertions, 13 deletions
diff --git a/app-misc/linux-logo/ChangeLog b/app-misc/linux-logo/ChangeLog index d2faab8f4ba6..03c0b3083bc4 100644 --- a/app-misc/linux-logo/ChangeLog +++ b/app-misc/linux-logo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/linux-logo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.75 2011/06/24 06:21:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.76 2011/06/24 16:29:24 jer Exp $ + + 24 Jun 2011; Jeroen Roovers <jer@gentoo.org> linux-logo-5.11.ebuild, + +files/logo_config: + Put logo_config in FILESDIR. Die more often. Move ./configure to + src_configure(). 24 Jun 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml: Maintain. diff --git a/app-misc/linux-logo/files/logo_config b/app-misc/linux-logo/files/logo_config new file mode 100644 index 000000000000..36839d23b3c1 --- /dev/null +++ b/app-misc/linux-logo/files/logo_config @@ -0,0 +1,7 @@ +./logos/gentoo.logo +./logos/gentoo2.logo +./logos/banner-simplified.logo +./logos/banner.logo +./logos/classic-no_periods.logo +./logos/classic-no_periods_or_chars.logo +./logos/classic.logo diff --git a/app-misc/linux-logo/linux-logo-5.11.ebuild b/app-misc/linux-logo/linux-logo-5.11.ebuild index 9ef830eafa12..9fe50bbeaa69 100644 --- a/app-misc/linux-logo/linux-logo-5.11.ebuild +++ b/app-misc/linux-logo/linux-logo-5.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.11.ebuild,v 1.1 2011/06/24 06:20:27 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.11.ebuild,v 1.2 2011/06/24 16:29:24 jer Exp $ EAPI="4" @@ -22,19 +22,16 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_prepare() { - 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/ + cp "${FILESDIR}"/logo_config "${S}"/ || die + cp "${FILESDIR}"/gentoo{,2}.logo "${S}"/logos/ || die echo "NAME gentoo" >> "${S}"/logos/gentoo.logo } -src_compile() { +src_configure() { + # Not an autotools based configure script ARCH="" ./configure --prefix="${D}"/usr || die +} +src_compile() { emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" } @@ -43,8 +40,8 @@ src_install() { 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 + cp "${FILESDIR}"/${PN}.conf "${WORKDIR}" || die + sed -i -e 's/-L 4 -f -u/-f -u/' "${WORKDIR}"/${PN}.conf || die newinitd "${FILESDIR}"/${PN}.initscript ${PN} newconfd "${WORKDIR}"/${PN}.conf ${PN} |