From fc7ac6eab5332d7cd599f36e1347c23e1d271acd Mon Sep 17 00:00:00 2001 From: Guillaume Castagnino Date: Sun, 28 Jul 2013 10:31:09 +0200 Subject: [PATCH] fix ac_aux_dir crap --- app-office/grisbi/ChangeLog | 6 +++++- app-office/grisbi/Manifest | 7 ++++--- .../grisbi/files/grisbi-fix-ac-aux-dir.patch | 12 ++++++++++++ app-office/grisbi/grisbi-1.0.9999.ebuild | 17 ++++++++++++----- app-office/grisbi/grisbi-9999.ebuild | 5 ++--- metadata/layout.conf | 1 + 6 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 app-office/grisbi/files/grisbi-fix-ac-aux-dir.patch create mode 100644 metadata/layout.conf diff --git a/app-office/grisbi/ChangeLog b/app-office/grisbi/ChangeLog index 28283c7..ab7e3e8 100644 --- a/app-office/grisbi/ChangeLog +++ b/app-office/grisbi/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for app-office/grisbi -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.41 2010/05/25 20:38:47 remi Exp $ + 28 Jul 2013; Guillaume Castagnino grisbi-1.0.9999.ebuild, + grisbi-9999.ebuild, +files/grisbi-fix-ac-aux-dir.patch: + fixing ac_aux_dir crap + 30 Jun 2012; Guillaume Castagnino -grisbi-0.8.9.ebuild, grisbi-0.8.9999.ebuild, grisbi-9999.ebuild: 0.8.9 in tree, sync tree modification in live ebuilds diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest index 14ec7d6..a52258b 100644 --- a/app-office/grisbi/Manifest +++ b/app-office/grisbi/Manifest @@ -1,6 +1,7 @@ AUX grisbi-1.0-nodev.patch 410 SHA256 9c7de8a243eeb76a68ead770ef175310440c0ed3fc73a5e247a8ec0db41db76f SHA512 6c2e0dbda18020a58e5c8b6ff07972e7ee3cecc5666a7608e9c3f1f8326fd576ad314f6ea66f950db3fadcdb0cd248df8dfcf1127a0fd826380d81b7b64ecc79 WHIRLPOOL 1a534bffdc28d68f8e7a943d0dffd7a0b5b49ad5b7939ed51dd5e0bbc6319900dc00277e953da59dcf8f8606a1812c81654e6f5d9f4f8883d0bfee6a561732cd +AUX grisbi-fix-ac-aux-dir.patch 501 SHA256 c573ec0ac2649a2a1a7f3ae1e2ccbae3c69313d782a4727a959146aab5072085 SHA512 973e982b861824d15ebd50e777688b9fcdd4f5b32c778958ca232efc3528585782e3133bac94621840fbbb1ab665ce11029736a0b409ccbe1da922cc20bf48cd WHIRLPOOL fd64430cca72fd1e333fb5e24278fce8c52269734b0790bb40dba12e1fd58affc080d380041a77699aba4b94bf9ef57b056a115e96137151c437d772123a6375 EBUILD grisbi-0.8.9999.ebuild 892 SHA256 dedd808b898998988633b1492a09a42a2a0c4c7c0fa9faa8ca0e9e5f13dfba66 SHA512 96536bdb91448cf9537bf7e45a64ed90b91cfa5b6b591f38a375a148699c25fea342bc91c72067dc684b0136d1996699c9c362d973124d3023dc340dd77a8f6b WHIRLPOOL 6f7cb0eb7d4d0004fdf78aefc6824a62fb22588ce1e206d405f25e9680a35221ab09c4e4c4cdbd3090277eee5928c7545c56c315686cb494ad9f6594aeda0236 -EBUILD grisbi-1.0.9999.ebuild 1024 SHA256 182cf314313e6d5bc26613b8196d06e83242fd4e946440ff4457550119384e12 SHA512 fe92b5f465c07fe3dc15210ef4852ec5bda87583626610fc44fa05c4eecbde3d96d0e22ddaf275ee0775601e1671a26b62bbd7494d3d8060391a071355862ace WHIRLPOOL 38aa76269f20ab3b7619f6e164c32862c784b299c7f88d8168f4d5b43c3b5e0448663c7809d1e1db29ce074e2a7f6e66b92800289d7580e12a4ba5caeb8db83b -EBUILD grisbi-9999.ebuild 934 SHA256 eb47be6011b4c4979f565f327dc11ca5b6ca8f7dc6ae96df87aee6af22a5d644 SHA512 f78479f7e8a886b8e30b48e350215739b6163a49854ef07b2a7073749b1b40d79d58ec3ff341fc470d0b06035182bef7a1482d5eb8e427769e9938f89e8a69e4 WHIRLPOOL fbd5542382cdcb16180fba55fd27e7498ebe1190bb763cb7940334c09c162871db103ae4b5097aaae585a1bc3ff78889b2b071c3a3a848630d71b8f99fcc85ee -MISC ChangeLog 9051 SHA256 84e096667c207957794ce25c38cfac4a28ddeea367c8a57cbb490e0258459da4 SHA512 8978e5fff71459de976e4eec3833f8d357a445fc6061beb1480fda0fad77fa13ffb6fdc10f1f3439f48accf8c646e9f89d1e071da6efa4c96a6fb2fcc68c6d26 WHIRLPOOL 8e4f93f8586846cdd1063a0c5440ca82e116e717d2230d3b128236b75926174b3ad9a1bb9e4ec97f7f76a55fd254464c6ab0d578b146a261914d51bda8f6a6b2 +EBUILD grisbi-1.0.9999.ebuild 1152 SHA256 7facdad64ebe9c2c8253da6b49da8c3c2115ce87e222e411277d49f3d3082a54 SHA512 d913e7ca56c2e70151b1ebedd4c5b180432500eb256e92c6aa71cac8d35f1388eae43f60d58d2bd53fb1a1caf039627b79aea364afc9155bc259bb77616bcb6f WHIRLPOOL b61df7c1fe603b6e93c6bc96febf4fad4c8fb01b102bb3f4b7d80cbe35121cb7ee305f521983b21b297e069d39e7a5145e6a08fddce124fb02f352817277f6a4 +EBUILD grisbi-9999.ebuild 917 SHA256 222e8851d374fec876f47b3b2ad8a331fcd989239f96427ab72d7f6370d863f4 SHA512 5338d994cf132e14d3ed55ff9f4c0eb68e53cc710ce4539e9778a34ae92b5960c6672652504f5bfaf21718a3aad7e347ac2b1e9d916026194b6b72d9984b32dd WHIRLPOOL 468e48db62aa44fdbdf6985513df7f45dc5112d0146840e0bb733f19bb41b429c121f560be720eef2a950e9e635dd06f68959564539bfebea054a87c4014295f +MISC ChangeLog 9214 SHA256 a38af89390d267729e5ba78820c969e8f9803e913693315a31e8281ba6848855 SHA512 949baf57759f7cb49655c100100a89889cc8317896a298bfb83094a633d89e063cfdcc8cebaa17f7f6eac9d4261e935e443912bdf7b92aec6c537376e04a77ae WHIRLPOOL 551bca7c6b32b489c8553bec9f35490159e8fb609f1a57c1e450d5c0d9011b615962c70c29dffb153c95ca56f971aa2f724436e4157c0eb66e6f87643d3a21dd MISC metadata.xml 504 SHA256 34b3f1e1c9ee96e2d4e6be7e8c276a9b89f6a72c9b843af93087f8682bce18e4 SHA512 2a2c87051e3e6e0f6d1fb48ab993b399771807496ade0906e5c16ad1ccee7e18c4e2eb06d1d423334ada655b5d8f6a72c0180d2aa30a9b742245989440421c48 WHIRLPOOL 3676faceed53a40faefe57fe9982d200ce27b76e53e11418fece4c396db117514c8739792ddcef8ef301f585165ba58e2cd8ccad0e8a2a596308d82a1cc6f6de diff --git a/app-office/grisbi/files/grisbi-fix-ac-aux-dir.patch b/app-office/grisbi/files/grisbi-fix-ac-aux-dir.patch new file mode 100644 index 0000000..45cf278 --- /dev/null +++ b/app-office/grisbi/files/grisbi-fix-ac-aux-dir.patch @@ -0,0 +1,12 @@ +diff --git a/configure.in b/configure.in +index ae9d5b3..7f145bb 100644 +--- a/configure.in ++++ b/configure.in +@@ -7,6 +7,7 @@ m4_define(grisbi_version, grisbi_major_version.grisbi_minor_version.grisbi_micro + + AC_INIT([grisbi],[grisbi_version],[http://grisbi.tuxfamily.org/mantis/login_select_proj_page.php?ref=bug_report_page.php],[grisbi],[http://www.grisbi.org/index.fr.html]) + ++AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_SRCDIR(src/main.c) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) diff --git a/app-office/grisbi/grisbi-1.0.9999.ebuild b/app-office/grisbi/grisbi-1.0.9999.ebuild index 07ec8d7..c1fcaa0 100644 --- a/app-office/grisbi/grisbi-1.0.9999.ebuild +++ b/app-office/grisbi/grisbi-1.0.9999.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="4" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" +AUTOTOOLS_AUTORECONF=1 -inherit eutils gnome2 git-2 +inherit autotools-utils eutils gnome2 git-2 DESCRIPTION="Grisbi is a personal accounting application for Linux" HOMEPAGE="http://www.grisbi.org" @@ -32,13 +33,19 @@ RDEPEND="dev-libs/libxml2 DEPEND="${RDEPEND} virtual/pkgconfig" +AUTOTOOLS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-1.0-nodev.patch + "${FILESDIR}"/${PN}-fix-ac-aux-dir.patch +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0-nodev.patch + autotools-utils_src_prepare } pkg_setup() { - G2CONF+="--with-plugins - --with-libxml2 + G2CONF+="--with-libxml2 --without-cunit --disable-static $(use_with ssl openssl) diff --git a/app-office/grisbi/grisbi-9999.ebuild b/app-office/grisbi/grisbi-9999.ebuild index 11c0c81..1616120 100644 --- a/app-office/grisbi/grisbi-9999.ebuild +++ b/app-office/grisbi/grisbi-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -32,8 +32,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { - G2CONF+="--with-plugins - --with-libxml2 + G2CONF+="--with-libxml2 --without-cunit --disable-static $(use_with ssl openssl) diff --git a/metadata/layout.conf b/metadata/layout.conf new file mode 100644 index 0000000..d43e61c --- /dev/null +++ b/metadata/layout.conf @@ -0,0 +1 @@ +masters = gentoo