public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-rpg/mana/, profiles/, games-rpg/mana/files/
@ 2017-03-12 21:24 Michał Górny
  0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2017-03-12 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     6a39941a49f1f3fb6c4d8679ebee347126a582e3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 21:19:52 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 21:24:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a39941a

games-rpg/mana: Remove last-rited pkg

 games-rpg/mana/Manifest                            |  1 -
 ...ssing-virtual-destructors-and-guichan-use.patch | 53 ---------------
 .../mana-0.6.1-Import-cstdint-for-int64_t.patch    | 24 -------
 ...nto-importing-C99-stdint.h-when-C-11-is-n.patch | 26 -------
 games-rpg/mana/files/mana-0.6.1-gentoo.patch       | 71 -------------------
 games-rpg/mana/mana-0.6.1.ebuild                   | 79 ----------------------
 games-rpg/mana/metadata.xml                        | 13 ----
 profiles/package.mask                              |  6 --
 8 files changed, 273 deletions(-)

diff --git a/games-rpg/mana/Manifest b/games-rpg/mana/Manifest
deleted file mode 100644
index d4932cf9194..00000000000
--- a/games-rpg/mana/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mana-0.6.1.tar.gz 4651447 SHA256 b945cd3e32489dfa5b8e82d571cc11e0e5308576307fca4d8dd7cf3cf6ed8c55 SHA512 d3cd66409f6eca274ee24c9d6f6355d2406b3f29fb6efdce82ef99dcc9a6945ff6dca39d3f4cbe031b8684d8e46c8d5c89937ed2e9eebfb2831f2ed8d02a6919 WHIRLPOOL 5b812dc7a2ff63ab3ace820f13fdea0df44685e9bfa0ed4a6aaefaea8c3889cda8b79678369a70e1f1fe855f0de973455cb37b1bbea7fc589a8741f3ae19d2bc

diff --git a/games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch b/games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch
deleted file mode 100644
index 6cd99bf4262..00000000000
--- a/games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b5dc2de418d6d06cce31d786862c5f548171a097 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 28 Jul 2012 15:52:35 +0200
-Subject: [PATCH 1/3] Fix missing virtual destructors and guichan use.
-
----
- src/gui/widgets/tabbedarea.h | 3 ++-
- src/gui/widgets/textfield.h  | 1 +
- src/resources/itemdb.h       | 2 +-
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
-index 45b092a..b43078a 100644
---- a/src/gui/widgets/tabbedarea.h
-+++ b/src/gui/widgets/tabbedarea.h
-@@ -98,7 +98,8 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
-         int getContainerHeight() const
-         { return mWidgetContainer->getHeight(); }
- 
--        using gcn::TabbedArea::setSelectedTab;
-+        void setSelectedTab(unsigned int index)
-+        { gcn::TabbedArea::setSelectedTab(index); }
- 
-         void setSelectedTab(gcn::Tab *tab);
- 
-diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
-index 2865403..94cada4 100644
---- a/src/gui/widgets/textfield.h
-+++ b/src/gui/widgets/textfield.h
-@@ -63,6 +63,7 @@ struct TextHistory {
- 
- class AutoCompleteLister {
- public:
-+    virtual ~AutoCompleteLister() {}
-     virtual void getAutoCompleteList(std::vector<std::string>&) const {}
- };
- 
-diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
-index 1531108..d7859ad 100644
---- a/src/resources/itemdb.h
-+++ b/src/resources/itemdb.h
-@@ -78,7 +78,7 @@ class ItemDB
-           mLoaded(false)
-         {}
- 
--        ~ItemDB()
-+        virtual ~ItemDB()
-         {}
- 
-         /**
--- 
-1.7.11.1
-

diff --git a/games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch b/games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch
deleted file mode 100644
index b7ab39d05cd..00000000000
--- a/games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dfd304e93bb9010ef8226ee4d026d45c9bf9d2f5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 28 Jul 2012 15:54:57 +0200
-Subject: [PATCH 3/3] Import cstdint for int64_t.
-
----
- src/net/download.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/net/download.h b/src/net/download.h
-index c0bdf20..b9ad17e 100644
---- a/src/net/download.h
-+++ b/src/net/download.h
-@@ -18,6 +18,7 @@
-  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <cstdint>
- #include <cstdio>
- #include <string>
- 
--- 
-1.7.11.1
-

diff --git a/games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch b/games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch
deleted file mode 100644
index fa752383c38..00000000000
--- a/games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From bb92108fed0242f1a3509384faeb2234d007c05e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 28 Jul 2012 15:54:10 +0200
-Subject: [PATCH 2/3] Trick gcc into importing C99 stdint.h when C++11 is not
- used.
-
----
- src/cpp0x_compat/cstdint | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/cpp0x_compat/cstdint b/src/cpp0x_compat/cstdint
-index d8d71d9..d430649 100644
---- a/src/cpp0x_compat/cstdint
-+++ b/src/cpp0x_compat/cstdint
-@@ -5,3 +5,8 @@
-  * compiles Mana fine so it apparently understands types like uint16_t by
-  * default.
-  */
-+
-+extern "C"
-+{
-+#include <stdint.h>
-+};
--- 
-1.7.11.1
-

diff --git a/games-rpg/mana/files/mana-0.6.1-gentoo.patch b/games-rpg/mana/files/mana-0.6.1-gentoo.patch
deleted file mode 100644
index 561336e421c..00000000000
--- a/games-rpg/mana/files/mana-0.6.1-gentoo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jun 30 20:48:23 UTC 2012
-Subject: build system
-
-use system fonts
-
-make datadir and bindir paths modifiable
-https://github.com/mana/mana/commit/02a7b2aa739cd0cf5a855f0a78b91d9fd5ad4385
-don't overwrite system/environment CXXFLAGS
-https://github.com/mana/mana/commit/2305ca095bee6b32c930f71b99d4c1205ceb561b
-add option to use system enet headers
-https://github.com/mana/mana/commit/d754a64e3839b3888d489046546195792e4ecc34
-
---- data/CMakeLists.txt.old	2011-08-02 12:15:38.520030381 +0200
-+++ data/CMakeLists.txt	2011-08-02 12:15:44.971029615 +0200
-@@ -1,6 +1,5 @@
- SET(DATA_DIR ${PKG_DATADIR}/data)
- 
--ADD_SUBDIRECTORY(fonts)
- ADD_SUBDIRECTORY(graphics)
- ADD_SUBDIRECTORY(help)
- ADD_SUBDIRECTORY(icons)
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -42,9 +42,9 @@
-     IF (NOT OSX AND NOT BEOS)
-         OPTION(USE_X11 "Use X11 Clipboard functionality" ON)
-     ENDIF ()
--    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana)
-+    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana CACHE PATH "Mana datadir")
-     SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
--    SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
-+    SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Mana bindir")
- ENDIF (WIN32)
- 
- ADD_SUBDIRECTORY(data)
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -12,7 +12,7 @@
- 
- IF (CMAKE_COMPILER_IS_GNUCXX)
-     # Help getting compilation warnings
--    SET(CMAKE_CXX_FLAGS "-Wall")
-+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-     IF (WIN32)
-         # This includes enough debug information to get something useful
-         # from Dr. Mingw while keeping binary size down. Almost useless
---- libs/enet/CMakeLists.txt
-+++ libs/enet/CMakeLists.txt
-@@ -1,3 +1,7 @@
-+INCLUDE(FindPkgConfig)
-+
-+OPTION(WITH_BUNDLEDHEADERS "Use bundled enet headers" ON)
-+
- INCLUDE(CheckFunctionExists)
- CHECK_FUNCTION_EXISTS(gethostbyaddr_r HAS_GETHOSTBYNAME_R)
- IF(HAS_GETHOSTBYNAME_R EQUAL 1)
-@@ -49,7 +53,12 @@
-   win32.c
-   )
- 
--INCLUDE_DIRECTORIES("include")
-+IF (WITH_BUNDLEDHEADERS)
-+	INCLUDE_DIRECTORIES("include")
-+ELSE (WITH_BUNDLEDHEADERS)
-+	PKG_CHECK_MODULES(ENET REQUIRED libenet)
-+	INCLUDE_DIRECTORIES("${ENET_INCLUDEDIR}")
-+ENDIF()
- 
- ADD_LIBRARY(enet STATIC ${SRCS})
- IF (BEOS)

diff --git a/games-rpg/mana/mana-0.6.1.ebuild b/games-rpg/mana/mana-0.6.1.ebuild
deleted file mode 100644
index d8e8dc3f915..00000000000
--- a/games-rpg/mana/mana-0.6.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils games
-
-DESCRIPTION="A fully free and open source MMORPG game client"
-HOMEPAGE="http://manasource.org/"
-SRC_URI="http://manasource.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls opengl"
-
-RDEPEND="!=games-rpg/tmw-0.5.2
-	>=dev-games/physfs-1.0.0
-	dev-libs/libxml2
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[png]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	net-misc/curl
-	sys-libs/zlib
-	media-libs/libpng:0
-	media-fonts/dejavu
-	>=dev-games/guichan-0.8.1[sdl]
-	media-libs/libsdl[X,opengl?,video]
-	media-libs/sdl-gfx
-	x11-libs/libX11
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-Fix-missing-virtual-destructors-and-guichan-use.patch
-	"${FILESDIR}"/${P}-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch
-	"${FILESDIR}"/${P}-Import-cstdint-for-int64_t.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	if [[ ${LINGUAS+set} ]]; then
-		for lang in $(grep -v ^# po/LINGUAS); do
-			has $lang $LINGUAS || sed -i "s:^${lang}:#${lang}:" po/LINGUAS
-		done
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl)
-		$(cmake-utils_use_enable nls)
-		-DPKG_DATADIR="${GAMES_DATADIR}/${PN}"
-		-DPKG_BINDIR="${GAMES_BINDIR}"
-		-DWITH_BUNDLEDHEADERS=OFF
-		-DENABLE_CPP0X=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-mono.ttf
-	insinto "${GAMES_DATADIR}"/${PN}/data
-	prepgamesdirs
-}

diff --git a/games-rpg/mana/metadata.xml b/games-rpg/mana/metadata.xml
deleted file mode 100644
index d41512ae07d..00000000000
--- a/games-rpg/mana/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-        <email>games@gentoo.org</email>
-        <name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://bugs.manasource.org/changelog_page.php</changelog>
-        <doc lang="en">http://doc.manasource.org/</doc>
-		<bugs-to>http://bugs.manasource.org/my_view_page.php</bugs-to>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 8790a5aa613..106b1e96c08 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -409,12 +409,6 @@ dev-python/mwlib-rl
 # Alpha release with new features, masked for testing
 =app-text/tesseract-4.00.00_alpha*
 
-# Lars Wendler <polynomial-c@gentoo.org> (27 Jan 2017)
-# Dead upstream since 2013.
-# Superseded by games-rpg/manaplus.
-# Masked for removal in 30 days.
-games-rpg/mana
-
 # Matt Turner <mattst88@gentoo.org> (26 Jan 2017)
 # Dead and replaced by media-libs/mesa[video_cards_radeonsi]
 # (or the proprietary amdgpu-pro, which is not in tree).


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-03-12 21:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-12 21:24 [gentoo-commits] repo/gentoo:master commit in: games-rpg/mana/, profiles/, games-rpg/mana/files/ Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox