Hi folks,

While fixing bug #240060 I touched fox.eclass.
In the process, I updated the eclass to 
    * use versionator
    * cut support for fox-1.0 (loong outdated)
    * cut support for fox-1.5
    * use eautomake instead of =automake-1.4*
    * use emake instead of make
    * use elog instead of einfo
    * apply more variable quoting

I'm sure, I missed one or the other issue. That's why I'm posting it
here for public review. If you have requests or comments to make, please
reply to this thread.
-- 
Regards, Matti Bickel
Signed/Encrypted email preferred (key 4849EC6C)

# 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 $

# fox eclass
#
# 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
# (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator,
# x11-misc/pathfinder, and x11-misc/shutterbug).
#
# Version numbering follows the kernel-style odd-even minor version
# designation.  Even-number minor versions are API stable, which patch
# releases aimed mostly at the library; apps generally won't need to be
# bumped for a patch release.
#
# Odd-number versions are development branches with their own SLOT and
# are API unstable; changes are made to the apps, and likely need to be
# bumped together with the library.
#
# Here are sample [R]DEPENDs for the fox apps
#	1.4: '=x11-libs/fox-1.4*'
#	1.5: '~x11-libs/fox-${PV}'
#	1.6: '=x11-libs/fox-${FOXVER}*'
#
# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses

inherit autotools eutils libtool versionator

FOX_PV="${FOX_PV:-${PV}}"
FOXVER=$(get_version_component_range 1-2)
FOXVER_SUFFIX="-${FOXVER}"

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"

IUSE="debug doc profile"

FOX_APPS="adie calculator pathfinder shutterbug chart"

if [ "${PN}" != fox ] ; then
	FOX_COMPONENT="${FOX_COMPONENT:-${PN}}"
fi

if [ "${PN}" != reswrap ] ; then
	RESWRAP_DEP="dev-util/reswrap"
fi

DEPEND="${RESWRAP_DEP}
	doc? ( app-doc/doxygen )
	>=sys-devel/automake-1.4
	>=sys-apps/sed-4"

S="${WORKDIR}/fox-${FOX_PV}"

fox_src_unpack() {
	unpack ${A}
	cd "${S}"

	ebegin "Fixing configure"

	# 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"

	eend

	ebegin "Fixing Makefiles"

	# don't build apps from top-level (i.e. x11-libs/fox)
	# utils == reswrap
	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} 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
	done
	eend

	ebegin "Running automake"
	eautomake || die "automake error"
	eend

	#elibtoolize
}

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"

	cd "${S}/${FOX_COMPONENT}"
	emake || die "compile error"

	# build class reference docs (FOXVER >= 1.2)
	if use doc && [ -z "${FOX_COMPONENT}" ] ; then
		cd "${S}/doc"
		emake docs || die "doxygen error"
	fi
}

fox_src_install () {
	cd "${S}/${FOX_COMPONENT}"

	emake install \
		DESTDIR="${D}" \
		htmldir=/usr/share/doc/${PF}/html \
		artdir=/usr/share/doc/${PF}/html/art \
		screenshotsdir=/usr/share/doc/${PF}/html/screenshots \
		|| die "install error"

	# create desktop menu items for apps
	case ${FOX_COMPONENT} in
		adie)
			newicon big_gif.gif adie.gif
			make_desktop_entry adie "Adie Text Editor" adie.gif
			;;
		calculator)
			newicon bigcalc.gif foxcalc.gif
			make_desktop_entry calculator "FOX Calculator" foxcalc.gif
			;;
		pathfinder)
			newicon iconpath.gif pathfinder.gif
			make_desktop_entry PathFinder "PathFinder" pathfinder.gif "FileManager"
			;;
		shutterbug)
			doicon shutterbug.gif
			make_desktop_entry shutterbug "ShutterBug" shutterbug.gif "Graphics"
			;;
	esac

	for doc in ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING ; do
		[ -f $doc ] && dodoc $doc
	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

	# install class reference docs (FOXVER >= 1.2) 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
	fi
}

fox_pkg_postinst() {
	if [ -z "${FOX_COMPONENT}" ] ; then
		elog "Multiple versions of the FOX Toolkit library may now be installed"
		elog "in parallel SLOTs on the same system."
		elog
		elog "The reswrap utility and the applications included in the FOX Toolkit"
		elog "(adie, calculator, pathfinder, shutterbug) are now available as"
		elog "separate ebuilds."
		echo
		elog "The fox-config script has been installed as fox-${FOXVER}-config."
		elog "The fox-wrapper package is used to direct calls to fox-config"
		elog "to the correct versioned script, based on the WANT_FOX variable."
		elog "For example:"
		elog
		elog "    WANT_FOX=\"${FOXVER}\" fox-config <options>"
		elog
	fi
}

EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst