Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
Subject: gentoo-x86 commit in x11-wm/amiwm: amiwm-0.20_p48.ebuild ChangeLog
Date: Sat, 29 May 2010 13:10:44 +0000 (UTC)
xarthisius    10/05/29 13:10:44

  Modified:             amiwm-0.20_p48.ebuild ChangeLog
  Log:
  Fix parallel build wrt bug 248680, don't strip files wrt bug 299918 + other QA fixes
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 x11-wm/amiwm/amiwm-0.20_p48.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild?r1=1.10&r2=1.11

Index: amiwm-0.20_p48.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- amiwm-0.20_p48.ebuild	27 Dec 2009 13:33:41 -0000	1.10
+++ amiwm-0.20_p48.ebuild	29 May 2010 13:10:44 -0000	1.11
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.10 2009/12/27 13:33:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.11 2010/05/29 13:10:44 xarthisius Exp $
 
-inherit eutils
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
 
 MY_P="${PN}${PV/_p/pl}"
 DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)"
@@ -14,39 +16,42 @@
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
+COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
+
+RDEPEND="${COMMON_DEPEND}
+	media-gfx/xloadimage
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	x11-terms/xterm"
+DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-flex.patch #110169
+pkg_setup() {
+	tc-export CC
 }
 
-src_compile() {
-	econf
-	# bug #248680
-	emake -j1 || die "build failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flex.patch \
+		"${FILESDIR}"/${P}-gentoo.diff
+	sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
+		Makefile.in || die
+	sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die
 }
 
 src_install() {
-	dodir /usr/bin
-	einstall || die
-
-	rm "${D}"/usr/bin/requestchoice
-	dosym /usr/lib/amiwm/requestchoice /usr/bin/requestchoice
-
-	dosed /usr/lib/amiwm/{Xinitrc,Xsession,Xsession2}
+	emake DESTDIR="${D}" install || die
 
-	dodoc INSTALL README*
+	dodoc README* || die
 
 	exeinto /etc/X11/Sessions
-	echo "/usr/bin/amiwm" > "${T}"/amiwm
+	cat <<- EOF > "${T}"/amiwm
+		#!/bin/sh
+		exec /usr/bin/amiwm
+	EOF
 	doexe "${T}"/amiwm
 }



1.11                 x11-wm/amiwm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	27 Dec 2009 13:33:41 -0000	1.10
+++ ChangeLog	29 May 2010 13:10:44 -0000	1.11
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/amiwm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.10 2009/12/27 13:33:41 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.11 2010/05/29 13:10:44 xarthisius Exp $
+
+  29 May 2010; Kacper Kowalik <xarthisius@g.o> amiwm-0.20_p48.ebuild,
+  +files/amiwm-0.20_p48-gentoo.diff:
+  Fix parallel build wrt bug 248680, don't strip files wrt bug 299918.
+  Thanks
+  Diego for reporting.
+  Fix install directories, respect CC and user flags, multilib-strict.
+  Fix incompatible implicit declaration of built-in function.
+  Update dependencies.
 
   27 Dec 2009; Diego E. Pettenò <flameeyes@g.o>
   amiwm-0.20_p48.ebuild:





Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in x11-wm/amiwm: amiwm-0.20_p48.ebuild ChangeLog
Next by thread:
gentoo-x86 commit in dev-perl/DBD-SQLite: ChangeLog DBD-SQLite-1.14.ebuild
Previous by date:
gentoo-x86 commit in x11-wm/amiwm/files: amiwm-0.20_p48-gentoo.diff
Next by date:
gentoo-x86 commit in x11-wm/amiwm: ChangeLog


Updated Nov 28, 2011

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.