From: Caleb Tennis Date: Tue, 19 Dec 2006 14:28:11 +0000 (+0000) Subject: Make sure we sed the proper stuff X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0db1a0611b9b76c86cb81ac435212a82b46b6013;p=gentoo.git Make sure we sed the proper stuff Package-Manager: portage-2.1.2_rc2-r5 --- diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 686e6b035bf5..35f4dcbc3fe0 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.402 2006/12/19 14:07:31 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.403 2006/12/19 14:28:11 caleb Exp $ + + 19 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + Make sure we catch sed the proper stuff 19 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: Make symbol export and examples handling part of configure options instead diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index b6aa0f6a81e9..2e431d248e3d 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -137,14 +137,14 @@ EBUILD qt-4.2.1.ebuild 7901 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 SHA1 MD5 0d748095dcbdd4785ae4e10838d3f8bd qt-4.2.1.ebuild 7901 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 qt-4.2.1.ebuild 7901 SHA256 91be57c3a8c1e6376472c5a2aa48bac1845fba83691c0737bd2bdb2294713dab qt-4.2.1.ebuild 7901 -EBUILD qt-4.2.2.ebuild 7208 RMD160 2004cee6f0c15ca716440af5f7747c700c506653 SHA1 9114b2f95136ab4ad13bfeb9dd3f5f85aea299a9 SHA256 1f1ff9a4036788657e4a4f1ba22432cf8684e6c63cd95d549b2a492a6d3eaa8f -MD5 065eb74243f4a7161730d5da269aae64 qt-4.2.2.ebuild 7208 -RMD160 2004cee6f0c15ca716440af5f7747c700c506653 qt-4.2.2.ebuild 7208 -SHA256 1f1ff9a4036788657e4a4f1ba22432cf8684e6c63cd95d549b2a492a6d3eaa8f qt-4.2.2.ebuild 7208 -MISC ChangeLog 23047 RMD160 ed1a6f817dadfb85579ace713316c42441c8b47b SHA1 e5cbe87c137c5eedda1e96b24bd8af2e4e1f702d SHA256 16d5f8da8fa64b926ec04b0b6c160ee385a1245c4c0fdae83171765649529e8c -MD5 3f40f5abb2abdd6bfc6eacd80a3c6f85 ChangeLog 23047 -RMD160 ed1a6f817dadfb85579ace713316c42441c8b47b ChangeLog 23047 -SHA256 16d5f8da8fa64b926ec04b0b6c160ee385a1245c4c0fdae83171765649529e8c ChangeLog 23047 +EBUILD qt-4.2.2.ebuild 7781 RMD160 a9dcc775ab5e17fea6713a553bf2611c796ea683 SHA1 4291059bae518dccb536de044689df659701a41d SHA256 7b81a0c75b8ae5cd80a7a404ddb68e3fdb7d9691733cf816f4f62d33fc1a290f +MD5 05bc2f2f4e9356e7f4b9fb08dc70f77f qt-4.2.2.ebuild 7781 +RMD160 a9dcc775ab5e17fea6713a553bf2611c796ea683 qt-4.2.2.ebuild 7781 +SHA256 7b81a0c75b8ae5cd80a7a404ddb68e3fdb7d9691733cf816f4f62d33fc1a290f qt-4.2.2.ebuild 7781 +MISC ChangeLog 23154 RMD160 f02e6552cdbb50d97272b87101463826cac09eec SHA1 a8f056714da16d9d2233a16fb2ae4b310d4b4be6 SHA256 48a0af80063078771666ff82d720ba76fed587b265912034827ffb6762602e7b +MD5 34b1dece6872618e87aabb54599a5c1e ChangeLog 23154 +RMD160 f02e6552cdbb50d97272b87101463826cac09eec ChangeLog 23154 +SHA256 48a0af80063078771666ff82d720ba76fed587b265912034827ffb6762602e7b ChangeLog 23154 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild index a5ac4fcdadbf..2628b6739050 100644 --- a/x11-libs/qt/qt-4.2.2.ebuild +++ b/x11-libs/qt/qt-4.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.7 2006/12/19 14:07:31 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.8 2006/12/19 14:28:11 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -110,7 +110,7 @@ src_unpack() { epatch ${FILESDIR}/qt-4.1.4-sparc.patch epatch ${FILESDIR}/qt4-sqlite-configure.patch - cd mkspecs/$(qt_mkspecs_dir) + cd ${S}/mkspecs/$(qt_mkspecs_dir) # set c/xxflags and ldflags # Don't let the user go too overboard with flags. If you really want to, uncomment @@ -124,12 +124,26 @@ src_unpack() { qmake.conf # Do not link with -rpath. See bug #75181. - sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \ - qmake.conf + sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib sed -i -e "s:X11R6/::" qmake.conf + # The trolls moved the definitions of the above stuff for g++, so we need to edit those files + # separately as well. + cd ${S}/mkspecs/common + + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + g++.conf + + # Do not link with -rpath. See bug #75181. + sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf + + # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib + sed -i -e "s:X11R6/::" linux.conf + cd ${S} }