public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-misc/linux-logo: linux-logo-5.11.ebuild ChangeLog
@ 2011-06-24  6:20 Jeroen Roovers (jer)
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2011-06-24  6:20 UTC (permalink / raw
  To: gentoo-commits

jer         11/06/24 06:20:28

  Modified:             ChangeLog
  Added:                linux-logo-5.11.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

Revision  Changes    Path
1.74                 app-misc/linux-logo/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/ChangeLog?r1=1.73&r2=1.74

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	18 Jun 2011 17:10:10 -0000	1.73
+++ ChangeLog	24 Jun 2011 06:20:27 -0000	1.74
@@ -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.73 2011/06/18 17:10:10 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.74 2011/06/24 06:20:27 jer Exp $
+
+*linux-logo-5.11 (24 Jun 2011)
+
+  24 Jun 2011; Jeroen Roovers <jer@gentoo.org> +linux-logo-5.11.ebuild:
+  Version bump.
 
   18 Jun 2011; Michał Januszewski <spock@gentoo.org> metadata.xml:
   Reassigning to maintainer-needed.



1.1                  app-misc/linux-logo/linux-logo-5.11.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/linux-logo-5.11.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/linux-logo-5.11.ebuild?rev=1.1&content-type=text/plain

Index: linux-logo-5.11.ebuild
===================================================================
# 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 $

EAPI="4"

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_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/
	echo "NAME gentoo" >> "${S}"/logos/gentoo.logo
}

src_compile() {
	ARCH="" ./configure --prefix="${D}"/usr || die
	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
}

src_install() {
	emake DESTDIR="${D}" 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

	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
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-misc/linux-logo: linux-logo-5.11.ebuild ChangeLog
@ 2011-06-24 16:29 Jeroen Roovers (jer)
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2011-06-24 16:29 UTC (permalink / raw
  To: gentoo-commits

jer         11/06/24 16:29:24

  Modified:             linux-logo-5.11.ebuild ChangeLog
  Log:
  Put logo_config in FILESDIR. Die more often. Move ./configure to src_configure().
  
  (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-misc/linux-logo/linux-logo-5.11.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/linux-logo-5.11.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/linux-logo-5.11.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/linux-logo-5.11.ebuild?r1=1.1&r2=1.2

Index: linux-logo-5.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.11.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-logo-5.11.ebuild	24 Jun 2011 06:20:27 -0000	1.1
+++ linux-logo-5.11.ebuild	24 Jun 2011 16:29:24 -0000	1.2
@@ -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 @@
 	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 @@
 
 	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}



1.76                 app-misc/linux-logo/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/linux-logo/ChangeLog?r1=1.75&r2=1.76

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	24 Jun 2011 06:21:25 -0000	1.75
+++ ChangeLog	24 Jun 2011 16:29:24 -0000	1.76
@@ -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.






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-06-24 16:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-24 16:29 [gentoo-commits] gentoo-x86 commit in app-misc/linux-logo: linux-logo-5.11.ebuild ChangeLog Jeroen Roovers (jer)
  -- strict thread matches above, loose matches on Subject: below --
2011-06-24  6:20 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox