# HG changeset patch # User Binki # Date 2009-01-10 20:17:40 # Node ID 4828dc0cb3bea4102d48715d896ed2088da756c1 # Parent 7dc23fdd78ee2ef1d018dbcf9a601d6b88866768 dev-db/qt-unixODBC: fixed sed-style regex syntax, fixed my fixes - it now compiles if your /lib and /usr/lib aren't links to /li64 and /usr/lib64 diff --git a/dev-db/qt-unixODBC/Manifest b/dev-db/qt-unixODBC/Manifest --- a/dev-db/qt-unixODBC/Manifest +++ b/dev-db/qt-unixODBC/Manifest @@ -1,5 +1,5 @@ AUX qt-no-rpath.patch 352 RMD160 2b5f24c23594531976f39723a4112261f4ad296a SHA1 4b2be020cb2ca4ffa499e0e2b7ba91e71203b7db SHA256 8cc1de2b9cebf6ef5a77d9deb18e7aa83d53258503076fb262d2981c1e25b1a4 DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e -EBUILD qt-unixODBC-3.3.8b.ebuild 2245 RMD160 ed53d269cbd6de64c49e341114c2e56bc3b97b96 SHA1 e78def63f5317db99f354ced2aad36d463804559 SHA256 8eb95a6b567a3006ad39022b17921f9efaf4531e468aca3b2a47f4e4f93fbec1 +EBUILD qt-unixODBC-3.3.8b.ebuild 2336 RMD160 374f4bee14bc7658e089f48c9e8c45a8ee7e9be1 SHA1 1a47ee5e8781181846108a467a10bded297593bb SHA256 cd141c5f77b13c9f31851b330b5b4e31dc91bf2a6734eaaf9183d0dc83f5db9e MISC ChangeLog 5283 RMD160 c309a35a39525de4b28edaaf69f2b5580e91e68b SHA1 185c9447049d803152ca5ed7291aa4c29a832ea9 SHA256 c784e857a454129991aea6f0b2518f2fdff87b4b6c73edc9696828ae21a7e36b MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild --- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild +++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild @@ -38,7 +38,8 @@ src_unpack() { -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ - -e "s:_LIBDIR.*=[^/]*(.*/)lib:_LIBDIR=\1$(get_libdir):" \ + -e "s:^QMAKE_LIBDIR\>.*=.*:QMAKE_LIBDIR=/usr/$(get_libdir) /$(get_libdir):" \ + -e "s:_LIBDIR\(.*\)=[^/]*\(.*/\)lib:_LIBDIR\1=\2$(get_libdir):" \ "${S}"/mkspecs/${PLATFORM}/qmake.conf || die "sed to fix CFLAGS failed" }