From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LWamT-0002u1-Bv for garchives@archives.gentoo.org; Mon, 09 Feb 2009 18:22:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B25FE0504; Mon, 9 Feb 2009 18:22:52 +0000 (UTC) Received: from mail.metalmail.org (mail.metalmail.org [87.118.103.88]) by pigeon.gentoo.org (Postfix) with ESMTP id D6D6BE0504 for ; Mon, 9 Feb 2009 18:22:51 +0000 (UTC) Received: from pluto.atHome (pD9E6B8B6.dip.t-dialin.net [217.230.184.182]) by mail.metalmail.org (Postfix) with ESMTP id E4543D880CE for ; Mon, 9 Feb 2009 19:22:55 +0100 (CET) Received: by pluto.atHome (sSMTP sendmail emulation); Mon, 09 Feb 2009 19:22:48 +0100 Date: Mon, 9 Feb 2009 19:22:48 +0100 From: Matti Bickel To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] RFC: fox.eclass update Message-ID: <20090209182248.GA9671@pluto> References: <20081012124139.GA3420@pluto> <20081013172038.GA23706@comet> <20081013182842.GA4061@pluto> <200810141520.53873.bo.andresen@zlin.dk> <20090208215522.GA7352@pluto> <1234191710.13899.229.camel@localhost> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="p2kqVDKq5asng8Dg" Content-Disposition: inline In-Reply-To: <1234191710.13899.229.camel@localhost> User-Agent: Mutt/1.5.16 (2007-06-09) X-Archives-Salt: fb6a6f7c-3b97-43e3-a2e6-7423f627379a X-Archives-Hash: 6d3cdc7676709501b339333b4f9a5e62 --p2kqVDKq5asng8Dg Content-Type: multipart/mixed; boundary="xXmbgvnjoT4axfJE" Content-Disposition: inline --xXmbgvnjoT4axfJE Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Peter Volkov wrote: > =D0=92 =D0=92=D1=81=D0=BA, 08/02/2009 =D0=B2 23:06 +0100, Matti Bickel = =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > +# could probably be lower > > +WANT_AUTOCONF=3D"latest" > > +WANT_AUTOMAKE=3D"latest" >=20 > These are defaults. You don't need to specify them. >=20 > > + eautomake || die "automake error" >=20 > eautomake dies on its own. You don't need || die here. Thanks for the comments, WANT_AUTO* was specified to make some previous commenter happy, but removed now ;) Where was that 'which functions || die on their own' table, anyway? --=20 Regards, Matti Bickel Signed/Encrypted email preferred (key 4849EC6C) --xXmbgvnjoT4axfJE Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="fox.eclass.patch" Content-Transfer-Encoding: quoted-printable --- /usr/portage/eclass/fox.eclass 2008-10-12 14:36:35.000000000 +0200 +++ fox-proposed.eclass 2009-02-09 19:21:03.000000000 +0100 @@ -1,8 +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:3= 1:36 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.7 2007/01/15 20:2= 7:06 mabi Exp $ =20 -# fox eclass +# @ECLASS: fox.eclass +# @MAINTAINER: mabi@gentoo.org +# @BLURB: Common build and install functions for fox-related apps and libr= ary +# @DESCRIPTION: Used by the x11-libs/fox library and all applications that= come +# with the upstream source tarball. # # This eclass allows building SLOT-able FOX Toolkit installations # (x11-libs/fox: headers, libs, and docs), which are by design @@ -19,26 +23,18 @@ # 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 -# fox versions that do not use this eclass are blocked in INCOMPAT_DEP bel= ow -# 1.0: '=3Dx11-libs/fox-1.0*' -# 1.2: '=3Dx11-libs/fox-1.2*' +# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses +# +# @EXAMPLE: Here are sample [R]DEPENDs for the fox apps # 1.4: '=3Dx11-libs/fox-1.4*' # 1.5: '~x11-libs/fox-${PV}' # 1.6: '=3Dx11-libs/fox-${FOXVER}*' -# -# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses - -inherit eutils libtool versionator =20 +inherit autotools eutils libtool versionator =20 FOX_PV=3D"${FOX_PV:-${PV}}" -PVP=3D(${FOX_PV//[-\._]/ }) -FOXVER=3D"${PVP[0]}.${PVP[1]}" - -if [ "${FOXVER}" !=3D "1.0" ] ; then - FOXVER_SUFFIX=3D"-${FOXVER}" -fi +FOXVER=3D$(get_version_component_range 1-2) +FOXVER_SUFFIX=3D"-${FOXVER}" =20 DESCRIPTION=3D"C++ based Toolkit for developing Graphical User Interfaces = easily and effectively" HOMEPAGE=3D"http://www.fox-toolkit.org/" @@ -46,44 +42,28 @@ =20 IUSE=3D"debug doc profile" =20 -# from fox-1.0 -FOX_APPS=3D"adie calculator pathfinder" -# from fox-1.2+ -if [ "${FOXVER}" !=3D "1.0" ] ; then - FOX_APPS=3D"${FOX_APPS} shutterbug" - FOX_CHART=3D"chart" -fi +# @ECLASS-VARIABLE: FOX_APPS +# @DESCRIPTION: all applications that come with the fox toolkit source +FOX_APPS=3D"adie calculator pathfinder shutterbug chart" =20 if [ "${PN}" !=3D fox ] ; then FOX_COMPONENT=3D"${FOX_COMPONENT:-${PN}}" fi =20 -if [ "${FOXVER}" !=3D "1.0" ] && [ -z "${FOX_COMPONENT}" ] ; then - DOXYGEN_DEP=3D"doc? ( app-doc/doxygen )" -fi - if [ "${PN}" !=3D reswrap ] ; then RESWRAP_DEP=3D"dev-util/reswrap" fi =20 -# These versions are not compatible with new fox layout -# and will cause collissions - we need to block them -INCOMPAT_DEP=3D"!=3Dsys-devel/automake-1.4 >=3Dsys-apps/sed-4" =20 S=3D"${WORKDIR}/fox-${FOX_PV}" =20 fox_src_unpack() { unpack ${A} - cd ${S} + cd "${S}" =20 ebegin "Fixing configure" =20 @@ -103,14 +83,14 @@ done =20 # use the installed reswrap for everything else - for d in ${FOX_APPS} ${FOX_CHART} tests ; do + 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 =20 # use the installed headers and library for apps for d in ${FOX_APPS} ; do - if version_is_at_least "1.6.34" ${PV} ; then + if version_is_at_least "1.6.34" ${PV}; then sed -i \ -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(include= dir)/fox${FOXVER_SUFFIX}:" \ -e 's:$(top_builddir)/src/libFOX:-lFOX:' \ @@ -124,19 +104,13 @@ ${d}/Makefile.am || die "sed ${d}/Makefile.am error" fi done - - # Upstream often has trouble with version number transitions - if [ "${FOXVER}" =3D=3D "1.5" ] ; then - sed -i -e 's:1.4:1.5:g' chart/Makefile.am - fi - eend =20 ebegin "Running automake" - automake-1.4 -a -c || die "automake error" + eautomake eend =20 - elibtoolize + #elibtoolize } =20 fox_src_compile() { @@ -150,21 +124,21 @@ $(use_with profile profiling) \ || die "configure error" =20 - cd ${S}/${FOX_COMPONENT} + cd "${S}/${FOX_COMPONENT}" emake || die "compile error" =20 # build class reference docs (FOXVER >=3D 1.2) - if use doc && [ "${FOXVER}" !=3D "1.0" ] && [ -z "${FOX_COMPONENT}" ] ; t= hen - cd ${S}/doc - make docs || die "doxygen error" + if use doc && [ -z "${FOX_COMPONENT}" ] ; then + cd "${S}/doc" + emake docs || die "doxygen error" fi } =20 fox_src_install () { - cd ${S}/${FOX_COMPONENT} + cd "${S}/${FOX_COMPONENT}" =20 - make install \ - DESTDIR=3D${D} \ + emake install \ + DESTDIR=3D"${D}" \ htmldir=3D/usr/share/doc/${PF}/html \ artdir=3D/usr/share/doc/${PF}/html/art \ screenshotsdir=3D/usr/share/doc/${PF}/html/screenshots \ @@ -195,41 +169,37 @@ done =20 # remove documentation if USE=3D-doc - if ( ! use doc ) && [ -d ${D}/usr/share/doc/${PF}/html ] ; then - rm -fr ${D}/usr/share/doc/${PF}/html + if ! use doc && [ -d "${D}"/usr/share/doc/${PF}/html ] ; then + rm -fr "${D}"/usr/share/doc/${PF}/html fi =20 # install class reference docs (FOXVER >=3D 1.2) if USE=3Ddoc - if use doc && [ "${FOXVER}" !=3D "1.0" ] && [ -z "${FOX_COMPONENT}" ] ; t= hen - dohtml -r ${S}/doc/ref + if use doc && [ -z "${FOX_COMPONENT}" ] ; then + dohtml -r "${S}"/doc/ref fi =20 # slot fox-config where present (FOXVER >=3D 1.2) - if [ -f ${D}/usr/bin/fox-config ] ; then - mv ${D}/usr/bin/fox-config ${D}/usr/bin/fox-${FOXVER}-config + if [ -f "${D}"/usr/bin/fox-config ] ; then + mv "${D}"/usr/bin/fox-config "${D}"/usr/bin/fox-${FOXVER}-config fi } =20 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 Toolk= it" + elog "(adie, calculator, pathfinder, shutterbug) are now available as" + elog "separate ebuilds." echo - einfo "Multiple versions of the FOX Toolkit library may now be installed" - einfo "in parallel SLOTs on the same system." - einfo - einfo "The reswrap utility and the applications included in the FOX Tool= kit" - einfo "(adie, calculator, pathfinder, shutterbug) are now available as" - einfo "separate ebuilds." - echo - if [ "${FOXVER}" !=3D "1.0" ] ; then - einfo "The fox-config script has been installed as fox-${FOXVER}-config= =2E" - 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=3D\"${FOXVER}\" fox-config " - einfo - epause - fi + 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=3D\"${FOXVER}\" fox-config " + elog fi } =20 --xXmbgvnjoT4axfJE-- --p2kqVDKq5asng8Dg Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAkmQdHgACgkQfNMcoUhJ7GyHsgCfQIjD3uoHncLUI8ecLwa9Aysp pqMAn19XriQFbrB+O3AA98O+9pXm1zf3 =SIG4 -----END PGP SIGNATURE----- --p2kqVDKq5asng8Dg--