From 332b15b9e21d5190bf221a63a3b3e49065c579b0 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Tue, 24 Jun 2008 00:31:47 +0000 Subject: Remove flex test during configure (#221365). Ebuild code cleanup. Package-Manager: portage-2.1.4.4 --- app-mobilephone/kannel/ChangeLog | 6 ++++- app-mobilephone/kannel/Manifest | 15 ++++++++++-- .../kannel/files/kannel-1.4.1-nolex.patch | 22 ++++++++++++++++++ app-mobilephone/kannel/kannel-1.4.1.ebuild | 27 ++++++++++++++-------- 4 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 app-mobilephone/kannel/files/kannel-1.4.1-nolex.patch (limited to 'app-mobilephone/kannel') diff --git a/app-mobilephone/kannel/ChangeLog b/app-mobilephone/kannel/ChangeLog index 5da0bab48f8c..9afcc0e1b313 100644 --- a/app-mobilephone/kannel/ChangeLog +++ b/app-mobilephone/kannel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-mobilephone/kannel # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.16 2008/05/21 15:52:40 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.17 2008/06/24 00:31:46 mrness Exp $ + + 24 Jun 2008; Alin Năstac + +files/kannel-1.4.1-nolex.patch, kannel-1.4.1.ebuild: + Remove flex test during configure (#221365). Ebuild code cleanup. 21 May 2008; Tiziano Müller kannel-1.4.1.ebuild: Changed dependency for postgresql from dev-db/postgresql to diff --git a/app-mobilephone/kannel/Manifest b/app-mobilephone/kannel/Manifest index 751b8fc29e33..607fd816dfbf 100644 --- a/app-mobilephone/kannel/Manifest +++ b/app-mobilephone/kannel/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX kannel-1.4.1-custom-wap-ports.patch 13266 RMD160 6d390b206dfbcc3e8749447ac6e419d9b67bcd0c SHA1 04bc815e29831450dfb1709f50480140b696ec01 SHA256 e0959fd25dd41fc2aa01b488fc70b0d29d1ab66aed1151de60fcc9e84e50512f +AUX kannel-1.4.1-nolex.patch 672 RMD160 2f7a63ed9a1e456aa99c914f401ebbf3c15cfb95 SHA1 b85d28d36cdf21120bac3afb61c5687a8f09126a SHA256 237a6ea2f2e39657ba49c0ee34d660e060bea94117e861f9f970b283c6cccb08 AUX kannel-confd 366 RMD160 7036907a3695a279dc3c9622cf081273834ba666 SHA1 89335740ca0fc412bf3ca994aed27dc00f8f9371 SHA256 78afde2b41edad9338894b2eab5968c2c93a2a657745d0bb8d2d1ba401d7cee0 AUX kannel-initd 1529 RMD160 285dbe2b181f356ef8ad5365bf32bd1bad2e4a62 SHA1 573851c2219a676dd42f8a6a7ac21e4dcd49dd85 SHA256 a1b0587fddd348c31ad2e02822e32b1389339b531259ddd84050447e2b9f9e6a DIST gateway-1.4.1.tar.gz 2596267 RMD160 45523a5aa23711a607e1ccf46eb4584897784fbe SHA1 4699aa3e6689a420bce24bba2356eb63e0767895 SHA256 0a70a1507883cba9bd44a0de39a04d3480f9781359a79f6f662020862270e44b -EBUILD kannel-1.4.1.ebuild 2265 RMD160 77602cc8ac697759ce63c434d266dde3b36ffed1 SHA1 623f3a361540aec5fa494ccf8adabc72f30e306a SHA256 17d30f32ae5b2bdd22772b615bc4127df6ee9e5f66b9b5399e1c26e869ab7ac8 -MISC ChangeLog 2715 RMD160 c25e432f090ff784b7ca1debca3520f589c8b7e7 SHA1 a517b526ffa59ce3349cc4a82342d1b77982a0d6 SHA256 8c4285255d09139411234d104105d32eb63d1e1e1aa4b2b3bb5b3df006058172 +EBUILD kannel-1.4.1.ebuild 2431 RMD160 c990c3ff87ed62de680041d73996488aa09373ed SHA1 55120ac795af29b243bff0856dd844c919822565 SHA256 1fddadcb93959236d59cebf08bde37a3ff18297e350b69b19fded2ebe3ea1754 +MISC ChangeLog 2886 RMD160 c58db3f8d0046a477bd490dd0ae02d7603a12fef SHA1 ec8c906f17a666137dffc7692b53d7ba9aa45264 SHA256 f7f6efb319925455da2ad19652289fc56d99768ee45f756121779ceeefdb6a3b MISC metadata.xml 389 RMD160 fc509383c09f88b4215f7cee07d3512647d0fddc SHA1 3fdf094c4c9ee7f53ebb752c3fa3f74b2e2c2efc SHA256 16236241363c791f472a403615d4cf12b0126967113605edce57329771795d61 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkhgQH4ACgkQ+fWpoTWIA9FDUgCcC/yIrPN719qoYJwTKnF174An +V4sAn3X+hiUUD1e96JdaaD+FFXpUvbsN +=S2W/ +-----END PGP SIGNATURE----- diff --git a/app-mobilephone/kannel/files/kannel-1.4.1-nolex.patch b/app-mobilephone/kannel/files/kannel-1.4.1-nolex.patch new file mode 100644 index 000000000000..07dfd147d677 --- /dev/null +++ b/app-mobilephone/kannel/files/kannel-1.4.1-nolex.patch @@ -0,0 +1,22 @@ +diff -Nru gateway-1.4.1.orig/configure.in gateway-1.4.1/configure.in +--- gateway-1.4.1.orig/configure.in 2008-06-24 02:00:07.000000000 +0200 ++++ gateway-1.4.1/configure.in 2008-06-24 02:06:05.000000000 +0200 +@@ -108,7 +108,6 @@ + AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_YACC +-AC_PROG_LEX + AC_PATH_PROG(CONVERT, convert) + AC_PATH_PROG(PERL, perl) + +diff -Nru gateway-1.4.1.orig/Makefile.in gateway-1.4.1/Makefile.in +--- gateway-1.4.1.orig/Makefile.in 2006-05-09 07:46:56.000000000 +0200 ++++ gateway-1.4.1/Makefile.in 2008-06-24 02:06:21.000000000 +0200 +@@ -60,7 +60,6 @@ + SHELL = @SHELL@ + VERSION = @VERSION@ + SUFFIX = @SUFFIX@ +-LEX = @LEX@ + PERL = @PERL@ + YACC = @YACC@ + diff --git a/app-mobilephone/kannel/kannel-1.4.1.ebuild b/app-mobilephone/kannel/kannel-1.4.1.ebuild index 9290568c4fe7..47906f2c2202 100644 --- a/app-mobilephone/kannel/kannel-1.4.1.ebuild +++ b/app-mobilephone/kannel/kannel-1.4.1.ebuild @@ -1,7 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.1.ebuild,v 1.7 2008/05/21 15:52:40 dev-zero Exp $ -inherit eutils +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.1.ebuild,v 1.8 2008/06/24 00:31:46 mrness Exp $ + +WANT_AUTOMAKE=none + +inherit eutils autotools flag-o-matic DESCRIPTION="Powerful SMS and WAP gateway" HOMEPAGE="http://www.kannel.org/" @@ -38,17 +41,19 @@ pkg_setup() { src_unpack() { unpack ${A} + cd "${S}" epatch "${FILESDIR}/${P}-custom-wap-ports.patch" + epatch "${FILESDIR}/${P}-nolex.patch" # flex is not used - cd "${S}" #by default, use current directory for logging sed -i -e 's:/tmp/::' doc/examples/kannel.conf - #correct doc path - sed -i -e "s:share/doc/kannel:share/doc/${P}:" configure configure.in + + eautoconf } src_compile() { - econf \ + append-flags -fno-strict-aliasing # some code breaks strict aliasing + econf --docdir=/usr/share/doc/${P} \ --enable-localtime \ --disable-start-stop-daemon \ $(use_enable pam) \ @@ -60,19 +65,21 @@ src_compile() { $(use_with sqlite) \ $(use_with sqlite3) \ $(use_with postgres pgsql) \ - || die "./configure failed" + || die "econf failed" emake || die "emake failed" } src_test() { - make check || die "make check failed" + emake check || die "make check failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" - use doc && make DESTDIR="${D}" install-docs + if use doc; then + emake DESTDIR="${D}" install-docs || die "emake install-docs failed" + fi dodoc README LICENSE diropts -g kannel -m0750 -- cgit v1.2.3-65-gdbad