Browse files

Merge branch 'master' of git.funtoo.org:funtoo-overlay

  • Loading branch information...
2 parents 922b9c4 + 1a1f996 commit 1e8dab4d5458e543a0aee3a5751fe7bcc3c630a8 @danielrobbins danielrobbins committed Sep 11, 2013
Showing with 1 addition and 52 deletions.
  1. +0 −52 dev-lang/php/files/iodbc-pkgconfig.patch
  2. +1 −0 dev-libs/libgdata/Manifest
View
52 dev-lang/php/files/iodbc-pkgconfig.patch
@@ -1,52 +0,0 @@
---- ext/odbc/config.m4.old 2013-04-06 11:26:04.047017826 +0200
-+++ ext/odbc/config.m4 2013-04-06 12:29:47.180617161 +0200
-@@ -366,22 +366,37 @@
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
-+[ --with-iodbc[=DIR] Include iODBC support])
-
- if test "$PHP_IODBC" != "no"; then
- AC_MSG_CHECKING(for iODBC support)
-- if test "$PHP_IODBC" = "yes"; then
-- PHP_IODBC=/usr/local
-+ if test -z "$PKG_CONFIG"; then
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ fi
-+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
-+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+ ODBC_TYPE=iodbc
-+ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
-+ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
-+ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
-+ PHP_EVAL_INCLINE($ODBC_INCLUDE)
-+ AC_DEFINE(HAVE_IODBC,1,[ ])
-+ AC_DEFINE(HAVE_ODBC2,1,[ ])
-+ AC_MSG_RESULT([$ext_output])
-+ else
-+ if test "$PHP_IODBC" = "yes"; then
-+ PHP_IODBC=/usr/local
-+ fi
-+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-+ ODBC_TYPE=iodbc
-+ ODBC_INCLUDE=-I$PHP_IODBC/include
-+ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-+ ODBC_LIBS=-liodbc
-+ AC_DEFINE(HAVE_IODBC,1,[ ])
-+ AC_DEFINE(HAVE_ODBC2,1,[ ])
-+ AC_MSG_RESULT([$ext_output])
- fi
-- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-- PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-- ODBC_TYPE=iodbc
-- ODBC_INCLUDE=-I$PHP_IODBC/include
-- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-- ODBC_LIBS=-liodbc
-- AC_DEFINE(HAVE_IODBC,1,[ ])
-- AC_DEFINE(HAVE_ODBC2,1,[ ])
-- AC_MSG_RESULT([$ext_output])
- fi
- fi
-
View
1 dev-libs/libgdata/Manifest
@@ -1,3 +1,4 @@
+DIST libgdata-0.13.3.tar.xz 1193512 SHA256 4bf52706b2ab404f8b128e000509acd9937facf26916d3e907a3db8653f73637 SHA512 d837a4569d33b7a941be3ddc5a08ba1c70c0dd5dfc8dacf380edfadfa019d10ab03cb822e679f28319e0e2eefa0f2ef7cf75c37bf6afcba2fad5fed7eb9e5607 WHIRLPOOL 069677535a01eb676bb30c4c808a4c3c23fed5ac3364e0be75fde015d5a89b6789970554c95a4a2b07f1b97a66de201f36ef6573d9a9b39fabffd4c004a5c0f6
DIST libgdata-0.13.4.tar.xz 1331592 SHA256 ae405145bb6a2109488b7123206b469b141f17317066471dd485b4ea50499c83 SHA512 a9914d64ac36a37e616791c92e211dc32985dd688b427d5a118a0cc9749e36386e7d63a908e82fd8dbbc70c6082056b232f40a2eb2b338271f0c7a42761ff99c WHIRLPOOL 1a403b28ecde115498dbdb802095abe11a28d8512da6da53874c10923e7c446c3c2706843fc89a0372c5107a844946de807a44df794061cbf4b1f8447a65e1bf
DIST libgdata-0.14.0.tar.xz 1358056 SHA256 5d415241ae4ca5a2d952bf7f3e9a372be6bb0537b24d83a05e5fc94948d292e9 SHA512 64bb2e81e6c092e4460a1a3f6e94d1456dcb171bafb5a32b779fe42d39452653118693d5eb9e858015dd6f3bad8a81df572a1c213f2b38d25f0a3a2dd51c46ab WHIRLPOOL b79b2382fc568a06caa7dc01fdae3c55b57e5fd8414cb5fa28a49b1ff1605ef33ff6ece1e0f675c4a25cbba5694a048d6f72427136cd886df40e00841f095366
DIST libgdata-0.8.1.tar.bz2 1201616 SHA256 080be3e677e6098d0f1bbcbaf8e474b4b94fad8a0d07b5a2969c3ab95b68d0b9 SHA512 61d65ceae7b82a497ba4c2c70a0486a108ae8dec9f0d7885fac8d33dd6a4f4d1eff068e39fb2ec5fed69f349de4d393adceca0ee242f2b4cb6045dbd48743643 WHIRLPOOL 0551ddcb3d9abb3e3633ffcb98e67036d5bdb914d3e95405b7c5568b471784548d02d3f4b0c4df4f76d2396a2be6400d564afc10527c2aa5ada9f812609ab8b0

0 comments on commit 1e8dab4

Please sign in to comment.