* [gentoo-commits] gentoo-x86 commit in eclass: fox.eclass
@ 2008-10-12 12:31 Matti Bickel (mabi)
0 siblings, 0 replies; 5+ messages in thread
From: Matti Bickel (mabi) @ 2008-10-12 12:31 UTC (permalink / raw
To: gentoo-commits
mabi 08/10/12 12:31:36
Modified: fox.eclass
Log:
fix bug #240060
Revision Changes Path
1.8 eclass/fox.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?r1=1.7&r2=1.8
Index: fox.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fox.eclass 15 Jan 2007 20:27:06 -0000 1.7
+++ fox.eclass 12 Oct 2008 12:31:36 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.7 2007/01/15 20:27:06 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.8 2008/10/12 12:31:36 mabi Exp $
# fox eclass
#
@@ -29,7 +29,7 @@
#
# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
-inherit eutils libtool
+inherit eutils libtool versionator
FOX_PV="${FOX_PV:-${PV}}"
@@ -110,11 +110,19 @@
# use the installed headers and library for apps
for d in ${FOX_APPS} ; do
- sed -i \
- -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \
- -e 's:../src/libFOX:-lFOX:' \
- -e 's:\.la::' \
- ${d}/Makefile.am || die "sed ${d}/Makefile.am error"
+ if version_is_at_least "1.6.34" ${PV} ; then
+ sed -i \
+ -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \
+ -e 's:$(top_builddir)/src/libFOX:-lFOX:' \
+ -e 's:\.la::' \
+ ${d}/Makefile.am || die "sed ${d}/Makefile.am error"
+ else
+ sed -i \
+ -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \
+ -e 's:../src/libFOX:-lFOX:' \
+ -e 's:\.la::' \
+ ${d}/Makefile.am || die "sed ${d}/Makefile.am error"
+ fi
done
# Upstream often has trouble with version number transitions
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: fox.eclass
@ 2010-09-18 11:11 Matti Bickel (mabi)
0 siblings, 0 replies; 5+ messages in thread
From: Matti Bickel (mabi) @ 2010-09-18 11:11 UTC (permalink / raw
To: gentoo-commits
mabi 10/09/18 11:11:34
Modified: fox.eclass
Log:
updated fox eclass for EAPI2
Revision Changes Path
1.9 eclass/fox.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?r1=1.8&r2=1.9
Index: fox.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fox.eclass 12 Oct 2008 12:31:36 -0000 1.8
+++ fox.eclass 18 Sep 2010 11:11:34 -0000 1.9
@@ -1,9 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.8 2008/10/12 12:31:36 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.9 2010/09/18 11:11:34 mabi Exp $
-# fox eclass
-#
+# @ECLASS: fox.eclass
+# @MAINTAINER:
+# mabi@gentoo.org
+# @BLURB: Functionality required the FOX Toolkit and it's applications
+# @DESCRIPTION:
# This eclass allows building SLOT-able FOX Toolkit installations
# (x11-libs/fox: headers, libs, and docs), which are by design
# parallel-installable, while installing only one version of the utils
@@ -20,25 +23,43 @@
# bumped together with the library.
#
# Here are sample [R]DEPENDs for the fox apps
-# fox versions that do not use this eclass are blocked in INCOMPAT_DEP below
-# 1.0: '=x11-libs/fox-1.0*'
-# 1.2: '=x11-libs/fox-1.2*'
-# 1.4: '=x11-libs/fox-1.4*'
-# 1.5: '~x11-libs/fox-${PV}'
-# 1.6: '=x11-libs/fox-${FOXVER}*'
+# 1.6: 'x11-libs/fox:1.6'
+# 1.7: '~x11-libs/fox-${PV}'
#
-# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
-
-inherit eutils libtool versionator
+# EAPI phase trickery borrowed from enlightenment.eclass
+inherit autotools versionator
-FOX_PV="${FOX_PV:-${PV}}"
-PVP=(${FOX_PV//[-\._]/ })
-FOXVER="${PVP[0]}.${PVP[1]}"
-if [ "${FOXVER}" != "1.0" ] ; then
- FOXVER_SUFFIX="-${FOXVER}"
-fi
+FOX_EXPF="src_unpack src_compile src_install pkg_postinst"
+case "${EAPI:-0}" in
+ 2|3|4) FOX_EXPF+=" src_prepare src_configure" ;;
+ *) ;;
+esac
+EXPORT_FUNCTIONS ${FOX_EXPF}
+
+# @ECLASS-VARIABLE: FOX_PV
+# @DESCRIPTION:
+# The version of the FOX Toolkit provided or required by the package
+: ${FOX_PV:=${PV}}
+
+# @ECLASS-VARIABLE: FOXVER
+# @INTERNAL
+# @DESCRIPTION:
+# The major.minor version of FOX_PV, usually acts as $SLOT and is used in
+# building the applications
+FOXVER=$(get_version_component_range 1-2 ${FOX_PV})
+
+# @ECLASS-VARIABLE: FOX_APPS
+# @INTERNAL
+# @DESCRIPTION:
+# The applications originally packaged in the FOX Toolkit
+FOX_APPS="adie calculator pathfinder shutterbug"
+
+# @ECLASS-VARIABLE: FOXCONF
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Set this to add additional configuration options during src_configure
DESCRIPTION="C++ based Toolkit for developing Graphical User Interfaces easily and effectively"
HOMEPAGE="http://www.fox-toolkit.org/"
@@ -46,35 +67,19 @@
IUSE="debug doc profile"
-# from fox-1.0
-FOX_APPS="adie calculator pathfinder"
-# from fox-1.2+
-if [ "${FOXVER}" != "1.0" ] ; then
- FOX_APPS="${FOX_APPS} shutterbug"
- FOX_CHART="chart"
-fi
-
-if [ "${PN}" != fox ] ; then
+if [[ ${PN} != fox ]] ; then
FOX_COMPONENT="${FOX_COMPONENT:-${PN}}"
fi
-if [ "${FOXVER}" != "1.0" ] && [ -z "${FOX_COMPONENT}" ] ; then
+if [[ -z ${FOX_COMPONENT} ]] ; then
DOXYGEN_DEP="doc? ( app-doc/doxygen )"
fi
-if [ "${PN}" != reswrap ] ; then
+if [[ ${PN} != reswrap ]] ; then
RESWRAP_DEP="dev-util/reswrap"
fi
-# These versions are not compatible with new fox layout
-# and will cause collissions - we need to block them
-INCOMPAT_DEP="!<x11-libs/fox-1.0.53
- !=x11-libs/fox-1.2.4
- !~x11-libs/fox-1.2.6
- !=x11-libs/fox-1.4.11"
-
-DEPEND="${INCOMPAT_DEP}
- ${DOXYGEN_DEP}
+DEPEND="${DOXYGEN_DEP}
${RESWRAP_DEP}
=sys-devel/automake-1.4*
>=sys-apps/sed-4"
@@ -83,88 +88,70 @@
fox_src_unpack() {
unpack ${A}
- cd ${S}
-
- ebegin "Fixing configure"
+ cd "${S}"
- # Respect system CXXFLAGS
- sed -i -e 's:CXXFLAGS=""::' configure.in || die "sed configure.in error"
- touch aclocal.m4
- sed -i -e 's:CXXFLAGS=""::' configure || die "sed configure error"
+ hasq src_prepare ${FOX_EXPF} || fox_src_prepare
+}
- eend
+fox_src_prepare() {
+ # fox changed from configure.in to configure.am in 1.6.38
+ local confFile="configure.ac"
+ [[ -r "configure.in" ]] && confFile="configure.in"
- ebegin "Fixing Makefiles"
+ # Respect system CXXFLAGS
+ sed -i -e 's:CXXFLAGS=""::' $confFile || die "sed ${confFile} error"
# don't build apps from top-level (i.e. x11-libs/fox)
# utils == reswrap
+ local d
for d in ${FOX_APPS} utils windows ; do
sed -i -e "s:${d}::" Makefile.am || die "sed Makefile.am error"
done
# use the installed reswrap for everything else
- for d in ${FOX_APPS} ${FOX_CHART} tests ; do
+ for d in ${FOX_APPS} chart tests ; do
sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
${d}/Makefile.am || die "sed ${d}/Makefile.am error"
done
# use the installed headers and library for apps
for d in ${FOX_APPS} ; do
- if version_is_at_least "1.6.34" ${PV} ; then
- sed -i \
- -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \
- -e 's:$(top_builddir)/src/libFOX:-lFOX:' \
- -e 's:\.la::' \
- ${d}/Makefile.am || die "sed ${d}/Makefile.am error"
- else
- sed -i \
- -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \
- -e 's:../src/libFOX:-lFOX:' \
- -e 's:\.la::' \
- ${d}/Makefile.am || die "sed ${d}/Makefile.am error"
- fi
+ sed -i \
+ -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox-${FOXVER}:" \
+ -e 's:$(top_builddir)/src/libFOX:-lFOX:' \
+ -e 's:\.la::' \
+ ${d}/Makefile.am || die "sed ${d}/Makefile.am error"
done
- # Upstream often has trouble with version number transitions
- if [ "${FOXVER}" == "1.5" ] ; then
- sed -i -e 's:1.4:1.5:g' chart/Makefile.am
- fi
-
- eend
+ eautoreconf
+}
- ebegin "Running automake"
- automake-1.4 -a -c || die "automake error"
- eend
+fox_src_configure() {
+ use debug && FOXCONF+=" --enable-debug" \
+ || FOXCONF+=" --enable-release"
- elibtoolize
+ econf ${FOXCONF} \
+ $(use_with profile profiling)
}
+
fox_src_compile() {
- local myconf
- use debug && myconf="${myconf} --enable-debug" \
- || myconf="${myconf} --enable-release"
-
- econf \
- ${FOXCONF} \
- ${myconf} \
- $(use_with profile profiling) \
- || die "configure error"
+ hasq src_configure ${FOX_EXPF} || fox_src_configure
- cd ${S}/${FOX_COMPONENT}
+ cd "${S}/${FOX_COMPONENT}"
emake || die "compile error"
# build class reference docs (FOXVER >= 1.2)
- if use doc && [ "${FOXVER}" != "1.0" ] && [ -z "${FOX_COMPONENT}" ] ; then
- cd ${S}/doc
- make docs || die "doxygen error"
+ if use doc && [[ -z ${FOX_COMPONENT} ]] ; then
+ emake -C "${S}"/doc docs || die "doxygen error"
fi
}
-fox_src_install () {
- cd ${S}/${FOX_COMPONENT}
+fox_src_install() {
+ cd "${S}/${FOX_COMPONENT}"
- make install \
- DESTDIR=${D} \
+ emake install \
+ DESTDIR="${D}" \
htmldir=/usr/share/doc/${PF}/html \
artdir=/usr/share/doc/${PF}/html/art \
screenshotsdir=/usr/share/doc/${PF}/html/screenshots \
@@ -195,18 +182,17 @@
done
# remove documentation if USE=-doc
- if ( ! use doc ) && [ -d ${D}/usr/share/doc/${PF}/html ] ; then
- rm -fr ${D}/usr/share/doc/${PF}/html
- fi
+ use doc || rm -fr "${D}/usr/share/doc/${PF}/html"
- # install class reference docs (FOXVER >= 1.2) if USE=doc
- if use doc && [ "${FOXVER}" != "1.0" ] && [ -z "${FOX_COMPONENT}" ] ; then
- dohtml -r ${S}/doc/ref
+ # install class reference docs if USE=doc
+ if use doc && [[ -z ${FOX_COMPONENT} ]] ; then
+ dohtml -r "${S}/doc/ref"
fi
- # slot fox-config where present (FOXVER >= 1.2)
- if [ -f ${D}/usr/bin/fox-config ] ; then
- mv ${D}/usr/bin/fox-config ${D}/usr/bin/fox-${FOXVER}-config
+ # slot fox-config
+ if [[ -f ${D}/usr/bin/fox-config ]] ; then
+ mv "${D}/usr/bin/fox-config" "${D}/usr/bin/fox-${FOXVER}-config" \
+ || die "failed to install fox-config"
fi
}
@@ -220,17 +206,12 @@
einfo "(adie, calculator, pathfinder, shutterbug) are now available as"
einfo "separate ebuilds."
echo
- if [ "${FOXVER}" != "1.0" ] ; then
- einfo "The fox-config script has been installed as fox-${FOXVER}-config."
- einfo "The fox-wrapper package is used to direct calls to fox-config"
- einfo "to the correct versioned script, based on the WANT_FOX variable."
- einfo "For example:"
- einfo
- einfo " WANT_FOX=\"${FOXVER}\" fox-config <options>"
- einfo
- epause
- fi
+ einfo "The fox-config script has been installed as fox-${FOXVER}-config."
+ einfo "The fox-wrapper package is used to direct calls to fox-config"
+ einfo "to the correct versioned script, based on the WANT_FOX variable."
+ einfo "For example:"
+ einfo
+ einfo " WANT_FOX=\"${FOXVER}\" fox-config <options>"
+ einfo
fi
}
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: fox.eclass
@ 2010-10-31 22:14 Matti Bickel (mabi)
0 siblings, 0 replies; 5+ messages in thread
From: Matti Bickel (mabi) @ 2010-10-31 22:14 UTC (permalink / raw
To: gentoo-commits
mabi 10/10/31 22:14:44
Modified: fox.eclass
Log:
update for use with fox-1.7
Revision Changes Path
1.10 eclass/fox.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?r1=1.9&r2=1.10
Index: fox.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fox.eclass 18 Sep 2010 11:11:34 -0000 1.9
+++ fox.eclass 31 Oct 2010 22:14:44 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.9 2010/09/18 11:11:34 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.10 2010/10/31 22:14:44 mabi Exp $
# @ECLASS: fox.eclass
# @MAINTAINER:
@@ -101,6 +101,9 @@
# Respect system CXXFLAGS
sed -i -e 's:CXXFLAGS=""::' $confFile || die "sed ${confFile} error"
+ # don't strip binaries
+ sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' $confFile || die "sed ${confFile} error"
+
# don't build apps from top-level (i.e. x11-libs/fox)
# utils == reswrap
local d
@@ -109,9 +112,10 @@
done
# use the installed reswrap for everything else
- for d in ${FOX_APPS} chart tests ; do
- sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
- ${d}/Makefile.am || die "sed ${d}/Makefile.am error"
+ for d in ${FOX_APPS} chart controlpanel tests ; do
+ [[ -d ${d} ]] &&
+ (sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
+ ${d}/Makefile.am || die "sed ${d}/Makefile.am error")
done
# use the installed headers and library for apps
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: fox.eclass
@ 2010-12-02 16:11 Diego Petteno (flameeyes)
0 siblings, 0 replies; 5+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-12-02 16:11 UTC (permalink / raw
To: gentoo-commits
flameeyes 10/12/02 16:11:32
Modified: fox.eclass
Log:
Drop automake-1.4 dependency, as it's useless here.
The eclass uses autotools.eclass to rebuild autotools, and since it
doesn't set WANT_AUTOMAKE, it'll always use the latest version; the
dependency over automake-1.4 is, thus, totally bogus.
Revision Changes Path
1.11 eclass/fox.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?r1=1.10&r2=1.11
Index: fox.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fox.eclass 31 Oct 2010 22:14:44 -0000 1.10
+++ fox.eclass 2 Dec 2010 16:11:32 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.10 2010/10/31 22:14:44 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.11 2010/12/02 16:11:32 flameeyes Exp $
# @ECLASS: fox.eclass
# @MAINTAINER:
@@ -81,7 +81,6 @@
DEPEND="${DOXYGEN_DEP}
${RESWRAP_DEP}
- =sys-devel/automake-1.4*
>=sys-apps/sed-4"
S="${WORKDIR}/fox-${FOX_PV}"
@@ -135,7 +134,7 @@
|| FOXCONF+=" --enable-release"
econf ${FOXCONF} \
- $(use_with profile profiling)
+ $(use_with profile profiling)
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: fox.eclass
@ 2011-08-09 4:26 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2011-08-09 4:26 UTC (permalink / raw
To: gentoo-commits
bicatali 11/08/09 04:26:21
Modified: fox.eclass
Log:
new url fetch
Revision Changes Path
1.13 eclass/fox.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?r1=1.12&r2=1.13
Index: fox.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fox.eclass 8 Jul 2011 11:35:01 -0000 1.12
+++ fox.eclass 9 Aug 2011 04:26:20 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.12 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.13 2011/08/09 04:26:20 bicatali Exp $
# @ECLASS: fox.eclass
# @MAINTAINER:
@@ -63,7 +63,7 @@
DESCRIPTION="C++ based Toolkit for developing Graphical User Interfaces easily and effectively"
HOMEPAGE="http://www.fox-toolkit.org/"
-SRC_URI="http://www.fox-toolkit.org/ftp/fox-${FOX_PV}.tar.gz"
+SRC_URI="ftp://ftp.fox-toolkit.org/pub/fox-${FOX_PV}.tar.gz"
IUSE="debug doc profile"
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-08-09 4:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-31 22:14 [gentoo-commits] gentoo-x86 commit in eclass: fox.eclass Matti Bickel (mabi)
-- strict thread matches above, loose matches on Subject: below --
2011-08-09 4:26 Sebastien Fabbro (bicatali)
2010-12-02 16:11 Diego Petteno (flameeyes)
2010-09-18 11:11 Matti Bickel (mabi)
2008-10-12 12:31 Matti Bickel (mabi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox