Remove old

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

5 files changed, 10 insertions, 252 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index a2334cb62abc..1424972d114b 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/simgear
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.72 2015/04/19 10:16:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.73 2015/05/14 22:43:12 reavertm Exp $
+
+  14 May 2015; Maciej Mrozowski <reavertm@gentoo.org>
+  -files/simgear-2.8.0-unbundle-expat.patch, -simgear-3.0.0.ebuild,
+  -simgear-3.2.0.ebuild:
+  Remove old
 
   19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> simgear-3.4.0.ebuild:
   Stable for x86, wrt bug #544714
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 61bf65a972af..2ba7be32a1ec 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,29 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX simgear-2.8.0-unbundle-expat.patch 4258 SHA256 05746f74ce815b2cf5ec0a01fe76954198bd4adfd04252d389b113362ac704a1 SHA512 e9dfb7d02c61eb57b75cf15547f37caa6b196c732a5350a44b04a3248606dde557a3b55f7a527e58eaae426469b8ca302402c036838efc45cc83bb6057faab88 WHIRLPOOL 1ac4643b7f983b6ea385e88a0d2f6981cb3876c4078bbc3ae3ed0e6781db996127b8708a9cd6002e06c86a745079f91d40f13d5b52f33853713f4840e0d5394c
-DIST simgear-3.0.0.tar.bz2 969971 SHA256 09448f87e6c2b5b6101a5a4eac331c1e1b998d61ec2e59614449110de2e68016 SHA512 a43ff90a28e3b17b5decdf5c16f541dda4c5b71a59e46cb7d55e58dead4c7d37d529408dad7480625410a2d71c63654baff1192c86158759e0f93a21674ad62d WHIRLPOOL 89466219168dd97a18eb4d26744138817b51aeefd848dea3b1f08b9cc24a729ce49f0d13e2976d2da445e8ad013cf3889f1a9893593528d5660dc432e0c0e736
-DIST simgear-3.2.0.tar.bz2 1020432 SHA256 b456cdc63b37d609bc24b347d43dc275eb7d06f5d92b18aeb0e66eedd3819c86 SHA512 2c3aaa90247032f7f900d475dde0708f5d43dfe9c22eb4d74a9a97de45508ae457ab6f6906d02af1177fddeef2d44d60255264fed7aa5705ff50f125cb96be6e WHIRLPOOL 5dd98d874829d5fef2268990ac7b3cd44e80fc1616fdfb38258196ec3356c9c8eab02430a12295de77399ac48f2204a39913fd40b4dae4c01062e23bc6b60fdd
 DIST simgear-3.4.0.tar.bz2 1057455 SHA256 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 WHIRLPOOL bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
-EBUILD simgear-3.0.0.ebuild 1077 SHA256 dcb8c45a2b77d4751503d9817ef0e2371f0a003b80c9b4afe811885952d8e053 SHA512 b01f094389a751cac261ed1e0fbbfe490b18adfbb747fef67383b4afb372f33140be495c8585ee1986acf91e4d767924c1a419b7ebfd1b8128458385bf753fff WHIRLPOOL bfad0039cc261864db2e0c1206ad6ab7fe4665a965d9cbd155bb17cddbcb110b2d9ce904aca68ee379d4749dd8a0badf77431cd04ad327b715933b28f6c9f84f
-EBUILD simgear-3.2.0.ebuild 1023 SHA256 ff4c4fcc10d8f1ca6031e73f45aade3822570fa906ebc71a737789c624666b70 SHA512 b93304f93b907fdc65084f25e8d2314f5b83fe0614ec76d57f560aeca03027684aeb4fb0523312a82f87d1df8939b374d7158ca2ac1edee251491db07ec7fa6c WHIRLPOOL 2c297b600099cafecccad1908b944d6b9b4adeefdcdf1d3952290b50f836f8dd761616d842aa953836026dde71962a3d155264cd567a729bef6d88deaea50881
 EBUILD simgear-3.4.0.ebuild 1023 SHA256 91f05846ba75167e07ee18c6e37da867a5d1c9581cec70eda1c30a8e5ae99137 SHA512 a05aa7704dc14e6e469f2a027afb1bee8b8fa83c3d1a010f758e06c901cce3c29d257223661b7bb67900da28a4503018468ab587b8e0625e635d224537d99aff WHIRLPOOL e9f9f16ac84d43879e5b2eb50b655a3e19afe36e65de17af87325175dad424fd96c7c13aebc63f5fbb7e8c8132112fe0ea60060deb452701970379d8f307b9e2
-MISC ChangeLog 11220 SHA256 90545b0130b4583b9294dfb4b81ffcdc166853328e02426508369c34bda13e05 SHA512 dfc95681145986cf70cc574c9862d24028671e84da8d285ece7f8d6797481fa1913086deaa1560366313d82fe0e7498e79ca33b04c71bb0d1b07298e68f33ca0 WHIRLPOOL 5b735297fb9f93cd962ca90072da01de0d4af5da8794fe7da9f1d0ed8340e2c576db11d4e0b7760592d98b0f854245f24efd67b1e681238cb7691a6642b61165
+MISC ChangeLog 11386 SHA256 e0f137c2d4af1399f5a82596819c8747c2b8a6f169f2e1aec448661c82a19f3b SHA512 3b9f8eced1e5c6d43df1bd2130a8237f706dd9a8bfa895896685f99eb44913022b3f61093951daa8c006bc3dd4ec8c1e2b5ea138c52405c68e93a6ef7aac8e17 WHIRLPOOL 26632a83550817a77ae4c23251741a7f94e47af66aa0b98235d84c5516b9b232504e19641e092a5f72043c0a8ab67c71949ecd1c9071deea3e2baab418e0c5f2
 MISC metadata.xml 531 SHA256 d03219a4ebdc08bebd4eb957c43a6a66691cb9469f781fb33cbadf21382eee60 SHA512 28d86be062e6d2b4adebcc61df436ea00af15386bf6e521f6ff415cab39abf3b4cd2d0b79483eda0acc21133ee57f257d28d30b62ffddf87c314f72f9da3e284 WHIRLPOOL e8f77b00b8fa6e2a783fafbf5b69a06e0e5dae43ef44a568bcdf0021a50c683d8cd20dbc4c866495026cc2df72f5b3c9d43f537c4cfdfe2538c95a7bf463db63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVM4BiAAoJELp701BxlEWfBQEQAIMf18RXMBJfGeOjVV/g3ovI
-wBSk49ZPXr+LC5YYEsc5gY6iQ6kVdPIzjJ9h3v73+JFfsOzh1j6KhtlM3v/8L4sn
-iOBJFa4F5NDrHAid/aPHw1UGZkEYLN60qz4ibk3ep8/f/xfjFjkdVOuCx/u6bPn7
-ZapiF4NoeKDXtVAETiQC9/DB0WIClj5LZS8s0d0nfn/F+sBIP83UV/FBCUicQQc5
-OIqYgeQSKoBGtwORnlMMgJIspKnwVkawzKNNFpec8Y8Zcr5e/IbReblwHHbYvxjw
-rTuT2QD7NM6BlGOC20X2SJTp3UlvT8MMZyrykz7j0IAaYfkgx8rdqW4fYL/sfK9v
-2m91YsOQsALOuIYpxloMasp1D6AHE9jh0V72kA1SjvouQ5XoXW2LbVzumuoNCnGX
-wY56n2BEqfxbli4/c86NhNoT9vpUtyw+BGbgWnrd6mjIrMDU84jRNbjZUve9SGDy
-I37X4I6lSGvuVZT1jb9wGF7khawO2trC0ZiyPmPTqGG4XPGiXaILHennnlJk1qK7
-V3YOs/vPpH4v9OO71EaD8QXW0ATCL6daiUpryHc523S5Dzx02I2U+ABSxiuJO0H3
-ECl07s7tHCU+A9XMCWcLjK7GXKMnhYhJf0GCU4ERAgnIHV3lqIDvqp8hk59qDI1e
-R+w150drulFsnd6JZWyH
-=UuKi
+iEYEAREIAAYFAlVVJSAACgkQFuHa/bHpVdtNygCgjEldOTxeYx4u+BSDAjwZZIts
+ceMAoJHn7nqpp9st+yA0wcM4zOm/QGEw
+=yhgd
 -----END PGP SIGNATURE-----
diff --git a/dev-games/simgear/files/simgear-2.8.0-unbundle-expat.patch b/dev-games/simgear/files/simgear-2.8.0-unbundle-expat.patch
deleted file mode 100644
index f9b8b6068111..000000000000
--- a/dev-games/simgear/files/simgear-2.8.0-unbundle-expat.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -ruN simgear-2.8.0/CMakeLists.txt my/CMakeLists.txt
---- simgear-2.8.0/CMakeLists.txt	2012-08-16 16:20:28.000000000 +0200
-+++ my/CMakeLists.txt	2012-09-22 00:25:49.814097209 +0200
-@@ -66,6 +66,7 @@
- option(ENABLE_LIBSVN    "Set to ON to build SimGear with libsvnclient support" ON)
- option(ENABLE_RTI       "Set to ON to build SimGear with RTI support" OFF)
- option(ENABLE_TESTS     "Set to OFF to disable building SimGear's test applications" ON)
-+option(SYSTEM_EXPAT     "Set to ON to build SimGear using the system libExpat" OFF)
- 
- if (MSVC)
-   GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
-@@ -148,6 +149,16 @@
- find_package(ZLIB REQUIRED)
- find_package(Threads REQUIRED)
- 
-+if (SYSTEM_EXPAT)
-+    message(STATUS "Requested to use system Expat library, forcing SIMGEAR_SHARED to true")
-+    set(SIMGEAR_SHARED ON)
-+    find_package(EXPAT REQUIRED)
-+    include_directories(${EXPAT_INCLUDE_DIRS})
-+else()
-+    message(STATUS "Using built-in expat code")
-+    add_definitions(-DHAVE_EXPAT_CONFIG_H)
-+endif(SYSTEM_EXPAT)
-+
- check_include_file(sys/time.h HAVE_SYS_TIME_H)
- check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)
- check_include_file(unistd.h HAVE_UNISTD_H)
-@@ -252,7 +263,6 @@
-     ${ALUT_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} )
- 
- add_definitions(-DHAVE_CONFIG_H)
--add_definitions(-DHAVE_EXPAT_CONFIG_H)
- 
- # configure a header file to pass some of the CMake settings
- # to the source code
-diff -ruN simgear-2.8.0/simgear/CMakeLists.txt my/simgear/CMakeLists.txt
---- simgear-2.8.0/simgear/CMakeLists.txt	2012-08-16 16:20:29.000000000 +0200
-+++ my/simgear/CMakeLists.txt	2012-09-22 00:29:52.244101431 +0200
-@@ -54,7 +54,9 @@
-     set_property(TARGET SimGearCore PROPERTY VERSION   ${SIMGEAR_VERSION})
-     set_property(TARGET SimGearCore PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
- 
--    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
-+    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY}
-+        ${EXPAT_LIBRARIES}
-+        ${CMAKE_THREAD_LIBS_INIT})
-     install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
-     if(LIBSVN_FOUND)
-diff -ruN simgear-2.8.0/simgear/simgear_config_cmake.h.in my/simgear/simgear_config_cmake.h.in
---- simgear-2.8.0/simgear/simgear_config_cmake.h.in	2012-08-16 16:20:29.000000000 +0200
-+++ my/simgear/simgear_config_cmake.h.in	2012-09-22 00:25:49.822097209 +0200
-@@ -17,3 +17,5 @@
- #cmakedefine HAVE_LIBSVN_CLIENT_1
- 
- #cmakedefine GCC_ATOMIC_BUILTINS_FOUND
-+
-+#cmakedefine SYSTEM_EXPAT
-diff -ruN simgear-2.8.0/simgear/xml/CMakeLists.txt my/simgear/xml/CMakeLists.txt
---- simgear-2.8.0/simgear/xml/CMakeLists.txt	2012-08-16 16:20:29.000000000 +0200
-+++ my/simgear/xml/CMakeLists.txt	2012-09-22 00:25:49.872097210 +0200
-@@ -7,26 +7,31 @@
-     )
-     
- set(SOURCES 
--    asciitab.h
--    hashtable.h
--    iasciitab.h
--    latin1tab.h
--    nametab.h
--    utf8tab.h
--    xmldef.h
--    xmlparse.h
--    xmlrole.h
--    xmltok.h
--    xmltok_impl.h
--    hashtable.c
--    xmlparse.c
--    xmlrole.c
--    xmltok.c
-     easyxml.cxx
--    internal.h
--    ascii.h
--    expat.h
--    expat_external.h
-     )
- 
-+if (NOT SYSTEM_EXPAT)
-+    list(APPEND SOURCES
-+        asciitab.h
-+        hashtable.h
-+        iasciitab.h
-+        latin1tab.h
-+        nametab.h
-+        utf8tab.h
-+        xmldef.h
-+        xmlparse.h
-+        xmlrole.h
-+        xmltok.h
-+        xmltok_impl.h
-+        hashtable.c
-+        xmlparse.c
-+        xmlrole.c
-+        xmltok.c
-+        internal.h
-+        ascii.h
-+        expat.h
-+        expat_external.h 
-+    )
-+endif()
-+    
- simgear_component(xml xml "${SOURCES}" "${HEADERS}")
-diff -ruN simgear-2.8.0/simgear/xml/easyxml.cxx my/simgear/xml/easyxml.cxx
---- simgear-2.8.0/simgear/xml/easyxml.cxx	2012-08-16 16:20:29.000000000 +0200
-+++ my/simgear/xml/easyxml.cxx	2012-09-22 00:25:49.889097210 +0200
-@@ -4,13 +4,22 @@
-  * This file is in the Public Domain, and comes with NO WARRANTY of any kind.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#  include <simgear_config.h>
-+#endif
-+     
- #include <simgear/compiler.h>
- 
- #include <string.h>		// strcmp()
- 
- #include "easyxml.hxx"
--#include "xmlparse.h"
--
-+     
-+#ifdef SYSTEM_EXPAT
-+#  include <expat.h>
-+#else
-+#  include "xmlparse.h"     
-+#endif
-+     
- #include <fstream>
- #include <iostream>
- 
diff --git a/dev-games/simgear/simgear-3.0.0.ebuild b/dev-games/simgear/simgear-3.0.0.ebuild
deleted file mode 100644
index a65bd4d67a0c..000000000000
--- a/dev-games/simgear/simgear-3.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-3.0.0.ebuild,v 1.4 2015/02/25 00:29:43 reavertm Exp $
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-IUSE="debug jpeg subversion test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-games/openscenegraph-3.0.1
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-	jpeg? ( virtual/jpeg:62 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
-	subversion? ( dev-vcs/subversion )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_RTI=OFF
-		-DENABLE_SOUND=ON
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		$(cmake-utils_use jpeg JPEG_FACTORY)
-		$(cmake-utils_use_enable test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-games/simgear/simgear-3.2.0.ebuild b/dev-games/simgear/simgear-3.2.0.ebuild
deleted file mode 100644
index fcd0a4442b1e..000000000000
--- a/dev-games/simgear/simgear-3.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-3.2.0.ebuild,v 1.3 2015/03/27 10:32:47 ago Exp $
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-IUSE="debug subversion test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-games/openscenegraph-3.2.0
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
-	subversion? ( dev-vcs/subversion )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-src_configure() {
-	local mycmakeargs=(
-		-ENABLE_PKGUTIL=OFF
-		-DENABLE_RTI=OFF
-		-DENABLE_SOUND=ON
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		$(cmake-utils_use_enable test TESTS)
-	)
-	cmake-utils_src_configure
-}