* [gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox: fluxbox-9999.ebuild ChangeLog fluxbox-1.1.0.1.ebuild fluxbox-1.0.0-r2.ebuild fluxbox-1.1.1-r1.ebuild fluxbox-1.1.1-r2.ebuild fluxbox-1.0.0.ebuild
@ 2010-08-16 19:43 Jonathan Callen (abcd)
0 siblings, 0 replies; only message in thread
From: Jonathan Callen (abcd) @ 2010-08-16 19:43 UTC (permalink / raw
To: gentoo-commits
abcd 10/08/16 19:43:13
Modified: fluxbox-9999.ebuild ChangeLog
fluxbox-1.1.0.1.ebuild fluxbox-1.0.0-r2.ebuild
fluxbox-1.1.1-r1.ebuild fluxbox-1.1.1-r2.ebuild
fluxbox-1.0.0.ebuild
Log:
Transfer prefix support from overlay: add prefix keywords, switch to EAPI-3, edit patches to use @GENTOO_PORTAGE_PREFIX@ and run eprefixify, add extra patches for Mac OS X and Interix
(Portage version: v2.2_rc67-475-g06c7c90/cvs/Linux i686)
Revision Changes Path
1.6 x11-wm/fluxbox/fluxbox-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?r1=1.5&r2=1.6
Index: fluxbox-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fluxbox-9999.ebuild 14 Nov 2009 16:09:34 -0000 1.5
+++ fluxbox-9999.ebuild 16 Aug 2010 19:43:13 -0000 1.6
@@ -1,9 +1,9 @@
-# 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/fluxbox/fluxbox-9999.ebuild,v 1.5 2009/11/14 16:09:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.6 2010/08/16 19:43:13 abcd Exp $
-EAPI=2
-inherit eutils git
+EAPI=3
+inherit eutils git prefix
IUSE="nls xinerama +truetype gnome +imlib +slit +toolbar vim-syntax"
@@ -52,6 +52,7 @@
# files in menu [include] items. This patch will allow us to do clever
# things with style ebuilds.
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
+ eprefixify util/fluxbox-generate_menu.in
# Add in the Gentoo -r number to fluxbox -version output.
if [[ "${PR}" == "r0" ]] ; then
@@ -73,8 +74,8 @@
$(use_enable imlib imlib2) \
$(use_enable slit ) \
$(use_enable toolbar ) \
- --sysconfdir=/etc/X11/${PN} \
- --with-style=/usr/share/fluxbox/styles/Emerge \
+ --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+ --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
${myconf}
}
1.276 x11-wm/fluxbox/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.276&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.276&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.275&r2=1.276
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- ChangeLog 29 May 2010 15:01:29 -0000 1.275
+++ ChangeLog 16 Aug 2010 19:43:13 -0000 1.276
@@ -1,6 +1,17 @@
# ChangeLog for x11-wm/fluxbox
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.275 2010/05/29 15:01:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.276 2010/08/16 19:43:13 abcd Exp $
+
+ 16 Aug 2010; Jonathan Callen <abcd@gentoo.org> fluxbox-1.0.0.ebuild,
+ +files/fluxbox-1.0.0-interix.patch,
+ files/1.1.0.1/gentoo_style_location.patch, fluxbox-1.0.0-r2.ebuild,
+ fluxbox-1.1.0.1.ebuild, fluxbox-1.1.1-r1.ebuild, fluxbox-1.1.1-r2.ebuild,
+ +files/fluxbox-1.1.1-osx-has-otool.patch,
+ files/gentoo_style_location-1.1.x.patch, fluxbox-9999.ebuild,
+ files/1.0.0/gentoo_style_location.patch:
+ Transfer prefix support from overlay: add prefix keywords, switch to
+ EAPI-3, edit patches to use @GENTOO_PORTAGE_PREFIX@ and run eprefixify,
+ add extra patches for Mac OS X and Interix
*fluxbox-1.1.1-r2 (29 May 2010)
1.6 x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?r1=1.5&r2=1.6
Index: fluxbox-1.1.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fluxbox-1.1.0.1.ebuild 3 Aug 2009 10:24:11 -0000 1.5
+++ fluxbox-1.1.0.1.ebuild 16 Aug 2010 19:43:13 -0000 1.6
@@ -1,9 +1,9 @@
-# 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/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.5 2009/08/03 10:24:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.6 2010/08/16 19:43:13 abcd Exp $
-EAPI="2"
-inherit eutils
+EAPI="3"
+inherit eutils prefix
IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax"
@@ -36,13 +36,14 @@
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
src_prepare() {
# We need to be able to include directories rather than just plain
# files in menu [include] items. This patch will allow us to do clever
# things with style ebuilds.
epatch "${FILESDIR}/${PV}/gentoo_style_location.patch"
+ eprefixify util/fluxbox-generate_menu.in
# Patch to handle a broken key file gracefully, #263379
epatch "${FILESDIR}/keyparse_hang.patch"
@@ -67,8 +68,8 @@
$(use_enable imlib imlib2) \
$(use_enable slit ) \
$(use_enable toolbar ) \
- --sysconfdir=/etc/X11/${PN} \
- --with-style=/usr/share/fluxbox/styles/Emerge \
+ --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+ --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
${myconf}
}
1.12 x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild?r1=1.11&r2=1.12
Index: fluxbox-1.0.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fluxbox-1.0.0-r2.ebuild 3 Aug 2009 10:24:11 -0000 1.11
+++ fluxbox-1.0.0-r2.ebuild 16 Aug 2010 19:43:13 -0000 1.12
@@ -1,9 +1,9 @@
-# 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/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.11 2009/08/03 10:24:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.12 2010/08/16 19:43:13 abcd Exp $
-EAPI="2"
-inherit eutils
+EAPI="3"
+inherit eutils prefix
IUSE="nls xinerama truetype kde gnome +imlib +slit +toolbar vim-syntax"
@@ -36,13 +36,14 @@
SLOT="0"
LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
src_prepare() {
# We need to be able to include directories rather than just plain
# files in menu [include] items. This patch will allow us to do clever
# things with style ebuilds.
epatch "${FILESDIR}/${PV}/gentoo_style_location.patch"
+ eprefixify util/fluxbox-generate_menu.in
# A couple menu generation fixes, #199437 and #199439
epatch "${FILESDIR}/${PV}/generate-menu.patch"
@@ -50,6 +51,9 @@
# Patch for gcc-4.3, #211675
epatch "${FILESDIR}/${PV}/gcc-4.3.patch"
+ # patch for interix (damaged langinfo.h)
+ epatch "${FILESDIR}"/${P}-interix.patch
+
# Add in the Gentoo -r number to fluxbox -version output.
if [[ "${PR}" == "r0" ]] ; then
suffix="gentoo"
@@ -71,8 +75,8 @@
$(use_enable imlib imlib2) \
$(use_enable slit ) \
$(use_enable toolbar ) \
- --sysconfdir=/etc/X11/${PN} \
- --with-style=/usr/share/fluxbox/styles/Emerge \
+ --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+ --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
${myconf}
}
1.8 x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild?r1=1.7&r2=1.8
Index: fluxbox-1.1.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fluxbox-1.1.1-r1.ebuild 19 Jul 2009 14:46:55 -0000 1.7
+++ fluxbox-1.1.1-r1.ebuild 16 Aug 2010 19:43:13 -0000 1.8
@@ -1,9 +1,9 @@
-# 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/fluxbox/fluxbox-1.1.1-r1.ebuild,v 1.7 2009/07/19 14:46:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild,v 1.8 2010/08/16 19:43:13 abcd Exp $
-EAPI="2"
-inherit eutils
+EAPI="3"
+inherit eutils prefix
IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax"
@@ -36,13 +36,16 @@
SLOT="0"
LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
src_prepare() {
# We need to be able to include directories rather than just plain
# files in menu [include] items. This patch will allow us to do clever
# things with style ebuilds.
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
+ eprefixify util/fluxbox-generate_menu.in
+
+ epatch "${FILESDIR}"/${P}-osx-has-otool.patch
# Patch to handle a broken key file gracefully, #263379
epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
@@ -73,8 +76,8 @@
$(use_enable imlib imlib2) \
$(use_enable slit ) \
$(use_enable toolbar ) \
- --sysconfdir=/etc/X11/${PN} \
- --with-style=/usr/share/fluxbox/styles/Emerge \
+ --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+ --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
${myconf}
}
1.2 x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild?r1=1.1&r2=1.2
Index: fluxbox-1.1.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-1.1.1-r2.ebuild 29 May 2010 15:01:29 -0000 1.1
+++ fluxbox-1.1.1-r2.ebuild 16 Aug 2010 19:43:13 -0000 1.2
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v 1.1 2010/05/29 15:01:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v 1.2 2010/08/16 19:43:13 abcd Exp $
-EAPI="2"
-inherit eutils
+EAPI="3"
+inherit eutils prefix
IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax -newmousefocus"
@@ -36,13 +36,16 @@
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
src_prepare() {
# We need to be able to include directories rather than just plain
# files in menu [include] items. This patch will allow us to do clever
# things with style ebuilds.
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
+ eprefixify util/fluxbox-generate_menu.in
+
+ epatch "${FILESDIR}"/${P}-osx-has-otool.patch
# Patch to handle a broken key file gracefully, #263379
epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
@@ -80,8 +83,8 @@
$(use_enable imlib imlib2) \
$(use_enable slit ) \
$(use_enable toolbar ) \
- --sysconfdir=/etc/X11/${PN} \
- --with-style=/usr/share/fluxbox/styles/Emerge \
+ --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+ --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
${myconf}
}
1.12 x11-wm/fluxbox/fluxbox-1.0.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild?r1=1.11&r2=1.12
Index: fluxbox-1.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fluxbox-1.0.0.ebuild 3 Aug 2009 10:24:11 -0000 1.11
+++ fluxbox-1.0.0.ebuild 16 Aug 2010 19:43:13 -0000 1.12
@@ -1,9 +1,9 @@
-# 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/fluxbox/fluxbox-1.0.0.ebuild,v 1.11 2009/08/03 10:24:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.12 2010/08/16 19:43:13 abcd Exp $
EAPI="2"
-inherit eutils
+inherit eutils prefix
IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
@@ -42,6 +42,7 @@
# files in menu [include] items. This patch will allow us to do clever
# things with style ebuilds.
epatch "${FILESDIR}/${PV}/gentoo_style_location.patch"
+ eprefixify util/fluxbox-generate_menu.in
# Add in the Gentoo -r number to fluxbox -version output.
if [[ "${PR}" == "r0" ]] ; then
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-16 19:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-16 19:43 [gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox: fluxbox-9999.ebuild ChangeLog fluxbox-1.1.0.1.ebuild fluxbox-1.0.0-r2.ebuild fluxbox-1.1.1-r1.ebuild fluxbox-1.1.1-r2.ebuild fluxbox-1.0.0.ebuild Jonathan Callen (abcd)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox