From: Mike Frysinger Date: Wed, 27 Dec 2006 17:34:43 +0000 (+0000) Subject: Respect user CFLAGS and install m4 into proper dir. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f285efb5bd3bbceecbfbd2af74c8a42c0d4cb673;p=gentoo.git Respect user CFLAGS and install m4 into proper dir. Package-Manager: portage-2.1.2_rc4-r1 --- diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog index cf44c798a741..f5bc7088c1f9 100644 --- a/media-libs/libdvdnav/ChangeLog +++ b/media-libs/libdvdnav/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libdvdnav -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.34 2006/06/22 17:03:59 grobian Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.35 2006/12/27 17:34:43 vapier Exp $ + + 27 Dec 2006; Mike Frysinger + +files/libdvdnav-0.1.10-build.patch, libdvdnav-0.1.10.ebuild: + Respect user CFLAGS and install m4 into proper dir. 22 Jun 2006; Fabian Groffen libdvdnav-0.1.10.ebuild: Marked ppc-macos stable (bug #111133) diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest index b712e4b36689..3e9ca43d5135 100644 --- a/media-libs/libdvdnav/Manifest +++ b/media-libs/libdvdnav/Manifest @@ -1,15 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX libdvdnav-0.1.10-build.patch 703 RMD160 306586c2ea31f0ddab02a650d233c63c13aed75b SHA1 7abb16303edf1a4932fc5f69215ef6a0397c4876 SHA256 8afa8ad9dfcf5a78503ba75df407da4318b0e259fbc670f1443d56cc8f1e9297 +MD5 13ec8e5edecb2b76be28e9c5387d0e83 files/libdvdnav-0.1.10-build.patch 703 +RMD160 306586c2ea31f0ddab02a650d233c63c13aed75b files/libdvdnav-0.1.10-build.patch 703 +SHA256 8afa8ad9dfcf5a78503ba75df407da4318b0e259fbc670f1443d56cc8f1e9297 files/libdvdnav-0.1.10-build.patch 703 DIST libdvdnav-0.1.10.tar.gz 539803 RMD160 75e7878ab6fd99294b5a1c8fca1391bdbf113616 SHA1 22289cb8f297664ce36551b818c0083e936632a7 SHA256 c2c6ee274cbd5759715a786b949df8ac3e848ffc771173c4f006b88c665346d0 -EBUILD libdvdnav-0.1.10.ebuild 611 RMD160 454bdb4ed6d8e63f16dc05424afe958b0e856bac SHA1 3a54bcf8a55afd6b4724789792c644df9f25b3f8 SHA256 ebf14b04dd120bc100c3bd867dbe94391f70a06eafa833b4905082587f9733a5 -MD5 5038b5fc403f8f5ea0f9320da2649f14 libdvdnav-0.1.10.ebuild 611 -RMD160 454bdb4ed6d8e63f16dc05424afe958b0e856bac libdvdnav-0.1.10.ebuild 611 -SHA256 ebf14b04dd120bc100c3bd867dbe94391f70a06eafa833b4905082587f9733a5 libdvdnav-0.1.10.ebuild 611 -MISC ChangeLog 4191 RMD160 4d221e1a9bb3586ad26bd1db94c1f3d1b4d88525 SHA1 e147bf590011a13698d9de4e61c3b8f935cafde0 SHA256 868b0c0712123edfb1ed3c1bd2706088173070fb312fff869c2ec343ce5dee81 -MD5 5c99d41dbffa22d1509cae623e7a3fc6 ChangeLog 4191 -RMD160 4d221e1a9bb3586ad26bd1db94c1f3d1b4d88525 ChangeLog 4191 -SHA256 868b0c0712123edfb1ed3c1bd2706088173070fb312fff869c2ec343ce5dee81 ChangeLog 4191 +EBUILD libdvdnav-0.1.10.ebuild 708 RMD160 5da3b7465a70dc344d9e7fa2c4d009d23c2aba01 SHA1 6f8f8220cafa1db18b6653ea28833f654f4b21ee SHA256 45710c2614a883062458c4cb8daa427da0a816584196a0576ff6cb6c93e8d162 +MD5 a089add8941aaec0e59f8281ad4010bb libdvdnav-0.1.10.ebuild 708 +RMD160 5da3b7465a70dc344d9e7fa2c4d009d23c2aba01 libdvdnav-0.1.10.ebuild 708 +SHA256 45710c2614a883062458c4cb8daa427da0a816584196a0576ff6cb6c93e8d162 libdvdnav-0.1.10.ebuild 708 +MISC ChangeLog 4359 RMD160 5d67567d204822c6926a45704f88029cd4b31d18 SHA1 9263c6a903ac9ebe6d125f3a4a59598f378a1504 SHA256 db0d2d21b8f18376a932838c7bb4fb2142b436e3ae40e02746a3d6c4bdae9952 +MD5 c71f061137ce4dc186aa48db28e23184 ChangeLog 4359 +RMD160 5d67567d204822c6926a45704f88029cd4b31d18 ChangeLog 4359 +SHA256 db0d2d21b8f18376a932838c7bb4fb2142b436e3ae40e02746a3d6c4bdae9952 ChangeLog 4359 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225 @@ -18,9 +22,9 @@ MD5 26160d39fe36a52996ebd4a6fad163f0 files/digest-libdvdnav-0.1.10 250 RMD160 f5f3dff530e51ea9b0e79fcfb94a4e0fa45f8292 files/digest-libdvdnav-0.1.10 250 SHA256 7b9698910e5c40dbf5a94af20edad11160517819efce8d4d0812b5064e264361 files/digest-libdvdnav-0.1.10 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFVp6SamhnQswr0vIRAiUrAJ0TSgFdICS1CRtCOliUX0meS91BdwCgtQ6t -Hcve1tKGl8fvyD695MH9cso= -=JK5B +iD8DBQFFkq7n8bi6rjpTunYRAudlAKDVnUiCyXyQkMw2t0NWPvmCXR1uvgCfTHmY +QHVohG+6WqIvMvUInAoCcRo= +=in7O -----END PGP SIGNATURE----- diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch new file mode 100644 index 000000000000..9c0bdda9e206 --- /dev/null +++ b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch @@ -0,0 +1,29 @@ +Use CFLAGS from environment and make sure we install the .m4 into the +correct place regardless of whether `aclocal` is installed on the host. + +--- configure ++++ configure +@@ -21459,8 +21459,9 @@ + ;; + esac + +-CFLAGS="-O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $CFLAGS" +-DEBUG_CFLAGS="-g -DDEBUG $CFLAGS" ++CFLAGS="$CFLAGS -Wall" ++CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" ++DEBUG_CFLAGS="$CFLAGS -g -DDEBUG" + + + +--- m4/Makefile.in ++++ m4/Makefile.in +@@ -116,8 +116,7 @@ + + EXTRA_DIST = dvdnav.m4 + +-@INSTALL_M4_TRUE@m4datadir = @ACLOCAL_DIR@ +-@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal ++m4datadir = $(datadir)/aclocal + + m4data_DATA = dvdnav.m4 + subdir = m4 diff --git a/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild b/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild index a2ebc25d5267..0373dcaf9044 100644 --- a/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild +++ b/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild,v 1.15 2006/11/12 04:09:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild,v 1.16 2006/12/27 17:34:43 vapier Exp $ + +inherit eutils DESCRIPTION="Library for DVD navigation tools" HOMEPAGE="http://sourceforge.net/projects/dvd/" @@ -14,6 +16,12 @@ IUSE="" RDEPEND="media-libs/libdvdread" DEPEND="${RDEPEND}" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-build.patch +} + src_install () { emake DESTDIR="${D}" install || die dodoc AUTHORS NEWS README