Revision: 2606 Author: lilrc Date: 2013-03-29 13:01:30 +0100 (Fri, 29 Mar 2013) Log Message: ----------- media-libs/phat: EAPI 5 and autotools-utils, use flag description, add patch to respect cflags
Modified Paths: -------------- trunk/overlays/proaudio/media-libs/phat/ChangeLog trunk/overlays/proaudio/media-libs/phat/Manifest trunk/overlays/proaudio/media-libs/phat/metadata.xml trunk/overlays/proaudio/media-libs/phat/phat-9999.ebuild Added Paths: ----------- trunk/overlays/proaudio/media-libs/phat/files/phat-9999-cflags.patch
Modified: trunk/overlays/proaudio/media-libs/phat/ChangeLog =================================================================== --- trunk/overlays/proaudio/media-libs/phat/ChangeLog 2013-03-29 11:17:12 UTC (rev 2605) +++ trunk/overlays/proaudio/media-libs/phat/ChangeLog 2013-03-29 12:01:30 UTC (rev 2606) @@ -1,7 +1,15 @@ # ChangeLog for media-libs/phat -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Mar 2013; Karl Linden (lilrc) <li...@users.sourceforge.net> + phat-9999.ebuild, +files/phat-9999-cflags.patch, metadata.xml: + Move to EAPI 5 and autotools-utils. + Add USE flag description. + Remove no-herd from metadata. + Add patch to respect our CFLAGS. + Disabling doc by default is redundant. + 22 Aug 2008; Frieder Buerzele <everm...@tuxfamily.org>; -phat-0.4.1.ebuild, phat-9999.ebuild: in portage fixup doc handling Modified: trunk/overlays/proaudio/media-libs/phat/Manifest =================================================================== --- trunk/overlays/proaudio/media-libs/phat/Manifest 2013-03-29 11:17:12 UTC (rev 2605) +++ trunk/overlays/proaudio/media-libs/phat/Manifest 2013-03-29 12:01:30 UTC (rev 2606) @@ -1,3 +1,4 @@ -EBUILD phat-9999.ebuild 1438 RMD160 cf4725d6e78866877e3a257b1e613a2387c49e8a SHA1 a3878341a633961ad1ef92d248eb45a4a615f486 SHA256 d778b80ab4f74fde186eac92b179209ff3b14d6a673fe910bdbfdf4bb701780b -MISC ChangeLog 1056 RMD160 be0a17e2eb8763acc7abda5c85e778e09a2cd539 SHA1 1b7d964e5fc1dffb23d84535c955a64704dde32d SHA256 a17f6713c56295736fd499baec4b8e6b1951843ba97fc94f6d387173d4057ef8 -MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 +AUX phat-9999-cflags.patch 1346 SHA256 ab80b15371b35cb4bedacb730a08c08a3b6f67192eb54431adac0c1d3c0c73e3 SHA512 058416dbfd9004395a0f0057e2f4af5144e2af608b4bf1f83b7309355775ca76f982949bd71872ed91e78486e70f62960a1b1de6a9ac62ad857d84729b5794b9 WHIRLPOOL 1906ac6c87e535676fe8c5bb3d98a506d27542f28dd726a72c9e40a3e586225942d7320d136dbc26361b7184918730d6db85fc0b802187f4fa465a22857a876d +EBUILD phat-9999.ebuild 1377 SHA256 aa83d282fdb1b07f9ee4913bc25092a331cbf9a89764051b529062e44a53ad04 SHA512 46a6420d2a1db6b0534a2d07008b1cadfb4620f26f916281337bdd6a772b20b790658613c677bac91440d521fe8b8aa146f60ad08a2dde5f2cdc84e632416c8f WHIRLPOOL 05ad9e39fd071dafb3794f0979d5c41588d77a6cf80ed9382e6803317673c99f5722f0eb656a043eff0c3c52a6481e560bda34541e3144d76e949d3a9ab9f178 +MISC ChangeLog 1361 SHA256 c8a511618f367d1098824d584b779ce6b8d9bd5127fdfc1715cf501f4f942967 SHA512 91ba55de5349e9b71df676d35e272f2ffa46cbc7b30d5f98874091636252a20d8ae5bb562982860434771780850b7ef6da013822d864671afb2f591f24208f50 WHIRLPOOL 1bbda3dbf87af079d1ec33e773e4fb85152238851401c3369d031a5c077f457315d9d69e4eb989f6e897fcbeacc97696b1877463c6a8a0e9ca5ed817f7c937b8 +MISC metadata.xml 332 SHA256 250c80089c978861ab52c873a3d896b64f3f137a6b7eaac88d71a5e001c1bad9 SHA512 b29530739034e04ae5db54128e38b4be7e84ad747870e6ad4989b7260fbee3d11a2d30e6035dc21fdfe03418954441624fd40a24838c941922bf5a96919cd1a0 WHIRLPOOL b095d79509dd5f8792f60a25ab05efd2ba50c574396a5e97b020550b2b647684bceed35d3a8a3581fb5e25c47510cc6b095d007df079fbbac10b3ec7227c7030 Added: trunk/overlays/proaudio/media-libs/phat/files/phat-9999-cflags.patch =================================================================== --- trunk/overlays/proaudio/media-libs/phat/files/phat-9999-cflags.patch (rev 0) +++ trunk/overlays/proaudio/media-libs/phat/files/phat-9999-cflags.patch 2013-03-29 12:01:30 UTC (rev 2606) @@ -0,0 +1,51 @@ +# A patch created by lilrc to respect cflags and remove deprecated stuff + +Index: configure.ac +=================================================================== +--- configure.ac (revision 118) ++++ configure.ac (working copy) +@@ -1,12 +1,13 @@ + # -*- autoconf -*- + # Process this file with autoconf to produce a configure script. + +-AC_INIT([phat/phatfanslider.c]) + + PHAT_VERSION=0.4.1 + AC_SUBST(PHAT_VERSION) + +-AM_INIT_AUTOMAKE([phat],${PHAT_VERSION}) ++AC_INIT([PHAT], [0.4.1]) ++AC_CONFIG_SRCDIR([phat/phatfanslider.c]) ++AM_INIT_AUTOMAKE + dnl AC_DISABLE_STATIC + AC_PROG_LIBTOOL + +@@ -20,12 +21,8 @@ + [if test x$enable_debug = xyes; then with_debug=yes ; fi]) + + if test x$with_debug = xno; then +- if test -z $CFLAGS; then +- CFLAGS="-O3" +- fi + AC_DEFINE(DEBUG, 0, [[whether to display debugging output or not]]) + else +- CFLAGS="$CFLAGS -g" + AC_DEFINE(DEBUG, 1, [[whether to display debugging output or not]]) + fi + +@@ -81,7 +78,7 @@ + PKG_CHECK_MODULES(MISC, libgnomecanvas-2.0) + + # set compilation flags +-CFLAGS="$CFLAGS $GTK_CFLAGS $MISC_CFLAGS -Wall -Werror" ++CFLAGS="$CFLAGS $GTK_CFLAGS $MISC_CFLAGS" + LIBS="$LIBS $GTK_LIBS $MISC_LIBS $SNDFILE_LIBS $SAMPLERATE_LIBS" + + # print build summary +@@ -133,5 +130,5 @@ + phat.spec + ]) + +-AM_CONFIG_HEADER([phat/config.h]) ++AC_CONFIG_HEADERS([phat/config.h]) + AC_OUTPUT Modified: trunk/overlays/proaudio/media-libs/phat/metadata.xml =================================================================== --- trunk/overlays/proaudio/media-libs/phat/metadata.xml 2013-03-29 11:17:12 UTC (rev 2605) +++ trunk/overlays/proaudio/media-libs/phat/metadata.xml 2013-03-29 12:01:30 UTC (rev 2606) @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>no-herd</herd> <maintainer> <email>proau...@tuxfamily.org</email> <name>pro-audio overlay team</name> </maintainer> + <use> + <flag name="glade">Build plugin for <pkg>dev-util/glade</pkg></flag> + </use> </pkgmetadata> Modified: trunk/overlays/proaudio/media-libs/phat/phat-9999.ebuild =================================================================== --- trunk/overlays/proaudio/media-libs/phat/phat-9999.ebuild 2013-03-29 11:17:12 UTC (rev 2605) +++ trunk/overlays/proaudio/media-libs/phat/phat-9999.ebuild 2013-03-29 12:01:30 UTC (rev 2606) @@ -1,59 +1,56 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit exteutils subversion autotools flag-o-matic toolchain-funcs +EAPI="5" +inherit exteutils subversion autotools-utils flag-o-matic toolchain-funcs + DESCRIPTION="Collection of GTK+ widgets geared toward pro-audio apps." -HOMEPAGE="https://developper.berlios.de/projects/phat/" +HOMEPAGE="https://developer.berlios.de/projects/phat/" -ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/phat/trunk/phat" +ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/${PN}/trunk/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -S="${WORKDIR}/${PN}" - -IUSE="debug -doc glade" -DEPEND=">x11-libs/gtk+-2 +IUSE="debug doc glade" +DEPEND=">=x11-libs/gtk+-2 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) glade? ( dev-util/glade )" -src_unpack() { - subversion_src_unpack ${A} - cd "${S}" - # workaround: bootstrap should not need gtkdocize if no docs are build +PATCHES=( "${FILESDIR}/${P}-cflags.patch" ) +DOCS=( AUTHORS BUGS NEWS README TODO ) + +AUTOTOOLS_IN_SOURCE_BUILD="1" +AUTOTOOLS_AUTORECONF="1" + +src_prepare() { + # workaround: autoreconf should not need gtkdocize if no docs are built if ! use doc ;then - esed_check -i -e "s@\(^gtkdocize.*\)@# \1@g" bootstrap touch gtk-doc.make - cd docs - esed_check -i -e "s@\(^EXTRA_DIST\).*@\1 =@g" Makefile.am - cd .. + esed_check -i -e "s@\(^EXTRA_DIST\).*@\1 =@g" docs/Makefile.am fi - ./bootstrap if [[ $(gcc-major-version)$(gcc-minor-version)$(gcc-micro-version) -ge 413 ]] ; then ewarn "Appending -fgnu89-inline to CFLAGS/CXXFLAGS" append-flags -fgnu89-inline fi + autotools-utils_src_prepare } -src_compile() { - if use glade; then - myconf="${myconf} --enable-glade-plugin" - fi - - econf $(use_enable debug) \ - $(use_enable doc gtk-doc)\ - $myconf || die "Configure failed" - - emake || die +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_enable doc gtk-doc) + $(use_enable glade glade-plugin) + ) + autotools-utils_src_configure } src_install() { - emake DESTDIR="${D}" install || die "Install failed" - dodoc AUTHORS BUGS NEWS README TODO - use doc || rm -rf "${D}"/usr/share/gtk-doc/html/${PN} + autotools-utils_src_install + use doc || rm -rf "${D}/usr/share/gtk-doc/html/${PN}" }