dev-games/flightgear: remove 2016.2.1

3 files changed, 0 insertions, 198 deletions

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 13bca2c28b10..49ae6d39bdd6 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,3 +1,2 @@
-DIST simgear-2016.2.1.tar.bz2 1161873 SHA256 601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a SHA512 22046873b67c2dd530d9734f799ea8a7238f6ffb58999b5a1d72053c4837212906048ec681cb2b704cd55d6b7aba03729d4f6a6a7e351f1e5aa2e497cc78d937 WHIRLPOOL 4f4fd697b301dfcd27a623d9475e63a46709d1e27b0324bdf097a8260d2759e7dedb16de6dbf1a82430dc3d80a32b58abf3bc82026894b83c2ec5c06391dcdcf
 DIST simgear-2016.3.1.tar.bz2 1199016 SHA256 ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd SHA512 5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716 WHIRLPOOL c349848d7e85166d7161272d722bebed7b387e6cd4c9db6cd405e3d042ee212b4448231eb92e0a86b8dc00c497af2c69455edd7d7d1cd4007d9ca09e91e575a7
 DIST simgear-3.4.0.tar.bz2 1057455 SHA256 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 WHIRLPOOL bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
diff --git a/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch b/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch
deleted file mode 100644
index 40bad3cc46ef..000000000000
--- a/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 2b15b6b8adce06107866fff0028503c1b92b0de4 Mon Sep 17 00:00:00 2001
-From: Maciej Mrozowski <reavertm@gmail.com>
-Date: Thu, 26 May 2016 02:24:19 +0200
-Subject: [PATCH] Add SYSTEM_UDNS CMake option. Remove spurious EXPAT_LIBRARIES
- linking when using bundled expat.
-
----
- 3rdparty/CMakeLists.txt     |  2 +-
- CMakeLists.txt              | 19 ++++++++++++++-----
- CMakeModules/FindUdns.cmake | 42 ++++++++++++++++++++++++++++++++++++++++++
- simgear/CMakeLists.txt      | 11 ++++++++++-
- 4 files changed, 67 insertions(+), 7 deletions(-)
- create mode 100644 CMakeModules/FindUdns.cmake
-
-diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
-index e9b5282..a03a82d 100644
---- a/3rdparty/CMakeLists.txt
-+++ b/3rdparty/CMakeLists.txt
-@@ -4,6 +4,6 @@ endif()
- 
- add_subdirectory(utf8)
- 
--if (ENABLE_DNS)
-+if (ENABLE_DNS AND NOT SYSTEM_UDNS)
- 	add_subdirectory(udns)
- endif()
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a67d65e..7de1a0a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,12 +114,14 @@ endif()
- 
- if (NOT MSVC)
- option(SIMGEAR_SHARED   "Set to ON to build SimGear as a shared library/framework" OFF)
--option(SYSTEM_EXPAT     "Set to ON to build SimGear using the system libExpat" OFF)
-+option(SYSTEM_EXPAT     "Set to ON to build SimGear using the system expat library" OFF)
-+option(SYSTEM_UDNS      "Set to ON to build SimGear using the system udns library" OFF)
- else()
- # Building SimGear DLLs is currently not supported for MSVC.
- set(SIMGEAR_SHARED OFF)
--# Using a system expat is currently not supported for MSVC - it would require shared simgear (DLL).
-+# Using external 3rd party libraries is currently not supported for MSVC - it would require shared simgear (DLL).
- set(SYSTEM_EXPAT OFF)
-+set(SYSTEM_UDNS OFF)
- endif()
- 
- option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF)
-@@ -426,9 +428,16 @@ endif()
- install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h  DESTINATION include/simgear/)
- 
- include_directories(3rdparty/utf8/source)
--if (ENABLE_DNS)
--    message(STATUS "DNS resolver: ENABLED")
--    include_directories(3rdparty/udns)
-+
-+if(ENABLE_DNS)
-+    if(SYSTEM_UDNS)
-+        message(STATUS "Requested to use system udns library, forcing SIMGEAR_SHARED to true")
-+        set(SIMGEAR_SHARED ON)
-+        find_package(Udns REQUIRED)
-+    else()
-+        message(STATUS "DNS resolver: ENABLED")
-+        include_directories(3rdparty/udns)
-+    endif()
- else()
-     message(STATUS "DNS resolver: DISABLED")
- endif()
-diff --git a/CMakeModules/FindUdns.cmake b/CMakeModules/FindUdns.cmake
-new file mode 100644
-index 0000000..a436361
---- /dev/null
-+++ b/CMakeModules/FindUdns.cmake
-@@ -0,0 +1,42 @@
-+# - Try to find UDNS library
-+# Once done this will define
-+#
-+#  UDNS_FOUND - system has UDNS
-+#  UDNS_INCLUDE_DIRS - the UDNS include directory
-+#  UDNS_LIBRARIES - Link these to use UDNS
-+#  UDNS_DEFINITIONS - Compiler switches required for using UDNS
-+#
-+#  Copyright (c) 2016 Maciej Mrozowski <reavertm@gmail.com>
-+#
-+# Distributed under the Boost Software License, Version 1.0.
-+# (See accompanying file LICENSE_1_0.txt or copy at
-+# http://www.boost.org/LICENSE_1_0.txt)
-+
-+
-+if (UDN_LIBRARIES AND UDN_INCLUDE_DIRS)
-+  # in cache already
-+  set(UDNS_FOUND TRUE)
-+else ()
-+  set(UDNS_DEFINITIONS "")
-+
-+  find_path(UDNS_INCLUDE_DIRS NAMES udns.h)
-+  find_library(UDNS_LIBRARIES NAMES udns)
-+
-+  if (UDNS_INCLUDE_DIRS AND UDNS_LIBRARIES)
-+    set(UDNS_FOUND TRUE)
-+  endif ()
-+
-+  if (UDNS_FOUND)
-+    if (NOT Udns_FIND_QUIETLY)
-+      message(STATUS "Found UDNS: ${UDNS_LIBRARIES}")
-+    endif ()
-+  else ()
-+    if (Udns_FIND_REQUIRED)
-+      message(FATAL_ERROR "Could not find UDNS")
-+    endif ()
-+  endif ()
-+
-+  # show the UDNS_INCLUDE_DIRS and UDNS_LIBRARIES variables only in the advanced view
-+  mark_as_advanced(UDNS_INCLUDE_DIRS UDNS_LIBRARIES)
-+
-+endif ()
-diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
-index 5976833..516ea6c 100644
---- a/simgear/CMakeLists.txt
-+++ b/simgear/CMakeLists.txt
-@@ -128,11 +128,20 @@ target_link_libraries(SimGearCore
-     ${ZLIB_LIBRARY}
-     ${RT_LIBRARY}
-     ${DL_LIBRARY}
--    ${EXPAT_LIBRARIES}
-     ${CMAKE_THREAD_LIBS_INIT}
-     ${COCOA_LIBRARY}
-     ${CURL_LIBRARIES})
- 
-+if(SYSTEM_EXPAT)
-+    target_link_libraries(SimGearCore
-+        ${EXPAT_LIBRARIES})
-+endif()
-+
-+if(ENABLE_DNS AND SYSTEM_UDNS)
-+    target_link_libraries(SimGearCore
-+        ${UDNS_LIBRARIES})
-+endif()
-+
- if(NOT SIMGEAR_HEADLESS)
-     target_link_libraries(SimGearScene
-         SimGearCore
--- 
-2.7.3
-
diff --git a/dev-games/simgear/simgear-2016.2.1.ebuild b/dev-games/simgear/simgear-2016.2.1.ebuild
deleted file mode 100644
index 91045754dc27..000000000000
--- a/dev-games/simgear/simgear-2016.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="+dns debug subversion test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-games/openscenegraph-3.2.0
-	media-libs/openal
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	dns? ( net-libs/udns )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
-	subversion? ( dev-vcs/subversion )
-"
-
-PATCHES=(
-	"${FILESDIR}/simgear-2016.2.1-unbundle-udns.patch"
-)
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DNS=$(usex dns)
-		-DENABLE_PKGUTIL=ON
-		-DENABLE_RTI=OFF
-		-DENABLE_SOUND=ON
-		-DENABLE_TESTS=$(usex test)
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		-DSYSTEM_UDNS=ON
-	)
-	cmake-utils_src_configure
-}