diff --git a/common/shlibs b/common/shlibs index c8c033bf492..d6cf6a327d5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1611,8 +1611,6 @@ libBulletCollision.so.2.83 bullet-2.83.5_1 libLinearMath.so.2.83 bullet-2.83.5_1 libBulletSoftBody.so.2.83 bullet-2.83.5_1 libinotifytools.so.0 libinotify-tools-3.14_2 -libgmock.so.0 gmock-1.7.0_1 -libgmock_main.so.0 gmock-1.7.0_1 libopensc.so.4 libopensc-0.16.0_1 libsmm-local.so.4 libopensc-0.16.0_1 libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1 diff --git a/srcpkgs/gmock/patches/import_private_module.patch b/srcpkgs/gmock/patches/import_private_module.patch deleted file mode 100644 index 2163b48036b..00000000000 --- a/srcpkgs/gmock/patches/import_private_module.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: google-mock-1.6.0/scripts/generator/gmock_gen.py -=================================================================== ---- scripts/generator/gmock_gen.py 2011-07-01 02:41:39.819517320 +0200 -+++ scripts/generator/gmock_gen.py 2011-07-01 02:43:26.396045796 +0200 -@@ -23,7 +23,7 @@ - - if __name__ == '__main__': - # Add the directory of this script to the path so we can import gmock_class. -- sys.path.append(os.path.dirname(__file__)) -+ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(__file__)), "share", "gmock")) - - from cpp import gmock_class - # Fix the docstring in case they require the usage. diff --git a/srcpkgs/gmock/patches/reenable_make_install.patch b/srcpkgs/gmock/patches/reenable_make_install.patch deleted file mode 100644 index f829f14bbe5..00000000000 --- a/srcpkgs/gmock/patches/reenable_make_install.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN gtest/Makefile.am gtest/Makefile.am ---- gtest/Makefile.am 2013-09-23 22:34:27.649060735 -0700 -+++ gtest/Makefile.am 2013-09-23 22:39:16.097069357 -0700 -@@ -299,8 +299,6 @@ - - install-exec-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." -- false - - install-data-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." -- false -diff -urN gtest/Makefile.in gtest/Makefile.in ---- gtest/Makefile.in 2013-09-23 22:34:27.654060735 -0700 -+++ gtest/Makefile.in 2013-09-23 22:41:35.593073526 -0700 -@@ -1349,11 +1349,9 @@ - - install-exec-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." -- false - - install-data-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." -- false - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -diff -urN Makefile.am Makefile.am ---- Makefile.am 2013-09-23 22:34:27.644060735 -0700 -+++ Makefile.am 2013-09-23 22:42:00.442074269 -0700 -@@ -209,8 +209,6 @@ - - install-exec-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system." -- false - - install-data-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system." -- false -diff -urN Makefile.in Makefile.in ---- Makefile.in 2013-09-23 22:34:27.663060735 -0700 -+++ Makefile.in 2013-09-23 22:42:12.904074641 -0700 -@@ -1346,11 +1346,9 @@ - - install-exec-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system." -- false - - install-data-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system." -- false - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/srcpkgs/gmock/template b/srcpkgs/gmock/template deleted file mode 100644 index 3bc59c9c1f4..00000000000 --- a/srcpkgs/gmock/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template build file for 'gmock' -pkgname=gmock -version=1.7.0 -revision=7 -build_style=gnu-configure -short_desc="Google C++ Mocking Framework" -maintainer="Enno Boland " -license="BSD" -hostmakedepends="unzip" -makedepends="gtest-devel" -depends="gtest" -homepage="https://code.google.com/p/googlemock" -distfiles="https://googlemock.googlecode.com/files/${pkgname}-${version}.zip" -checksum=26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b - -post_install() { - # gmock is unable to detect the systems gtest, therefore delete the included - # version of gtest explicitly. - rm -r $DESTDIR/usr/lib/libgtest*.{so*,a} \ - $DESTDIR/usr/share/aclocal/gtest.m4 \ - $DESTDIR/usr/include/gtest -} - -gmock-devel_package() { - depends="gmock>=${version}_${revision} gtest-devel" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/share - } -}