old

(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 135 deletions

diff --git a/games-engines/scummvm-tools/ChangeLog b/games-engines/scummvm-tools/ChangeLog
index d04dd37687ea..25b3cc8a0280 100644
--- a/games-engines/scummvm-tools/ChangeLog
+++ b/games-engines/scummvm-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/scummvm-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/ChangeLog,v 1.64 2014/10/27 16:05:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/ChangeLog,v 1.65 2014/10/30 02:18:55 mr_bones_ Exp $
+
+  30 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/scummvm-tools-1.4.0-boost.patch, -scummvm-tools-1.4.0.ebuild:
+  old
 
   27 Oct 2014; Agostino Sarubbo <ago@gentoo.org> scummvm-tools-1.7.0.ebuild:
   Stable for ppc64, wrt bug #520878
diff --git a/games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch b/games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch
deleted file mode 100644
index d492e194d3c5..000000000000
--- a/games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 36cb68919303bc2b874a5faa879e269a35874eff Mon Sep 17 00:00:00 2001
-From: Johannes Schickel <lordhoto@scummvm.org>
-Date: Sat, 3 Nov 2012 21:57:08 +0100
-Subject: [PATCH] TOOLS: Fix decompiler compilation with gcc 4.7.
-
----
- decompiler/refcounted.h |   10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/decompiler/refcounted.h b/decompiler/refcounted.h
-index a496ff7..f4d9020 100644
---- a/decompiler/refcounted.h
-+++ b/decompiler/refcounted.h
-@@ -25,10 +25,8 @@
- 
- class RefCounted;
- 
--namespace boost {
- inline void intrusive_ptr_add_ref(RefCounted *p);
- inline void intrusive_ptr_release(RefCounted *p);
--} // End of namespace boost
- 
- /**
-  * Provides a base implementation of reference counting for use with boost::intrusive_ptr.
-@@ -36,16 +34,14 @@
- class RefCounted {
- private:
- 	long _refCount; ///< Reference count used for boost::intrusive_ptr.
--	friend void ::boost::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods in boost namespace.
--	friend void ::boost::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods in boost namespace.
-+	friend void ::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods.
-+	friend void ::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods.
- 
- protected:
- 	RefCounted() : _refCount(0) { }
- 	virtual ~RefCounted() { }
- };
- 
--namespace boost {
--
- /**
-  * Add a reference to a pointer.
-  */
-@@ -61,6 +57,4 @@ inline void intrusive_ptr_release(RefCounted *p) {
- 		delete p;
- }
- 
--} // End of namespace boost
--
- #endif
--- 
-1.7.10
-
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild
deleted file mode 100644
index b179124f7761..000000000000
--- a/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild,v 1.8 2012/11/04 04:31:47 mr_bones_ Exp $
-
-EAPI=2
-WX_GTK_VER=2.8
-inherit wxwidgets eutils flag-o-matic games
-
-DESCRIPTION="utilities for the SCUMM game engine"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/scummvm/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="flac iconv mad png vorbis"
-RESTRICT="test" # some tests require external files
-
-RDEPEND="png? ( media-libs/libpng )
-	mad? ( media-libs/libmad )
-	flac? ( media-libs/flac )
-	vorbis? ( media-libs/libvorbis )
-	iconv? ( virtual/libiconv media-libs/freetype:2 )
-	sys-libs/zlib
-	>=dev-libs/boost-1.32
-	x11-libs/wxGTK:2.8"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-boost.patch
-	rm -rf *.bat dists/win32
-	# use $T instead of /tmp - bug #402459
-	sed -i \
-		-e 's:/tmp:"${T}":' \
-		configure || die
-	sed -ri \
-		-e '/^(CC|CXX)\b/d' \
-		Makefile || die
-
-	local boost_ver=$(best_version ">=dev-libs/boost-1.32")
-
-	boost_ver=${boost_ver/*boost-/}
-	boost_ver=${boost_ver%.*}
-	boost_ver=${boost_ver/./_}
-
-	einfo "Using boost version ${boost_ver}"
-	append-cxxflags \
-        -I/usr/include/boost-${boost_ver}
-	append-ldflags \
-        -L/usr/$(get_libdir)/boost-${boost_ver}
-	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
-	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
-}
-
-src_configure() {
-	# Not an autoconf script
-	./configure \
-		--enable-verbose-build \
-		--mandir=/usr/share/man \
-		--prefix=/usr/games \
-		--libdir=/usr/games/lib \
-		$(use_enable flac) \
-		$(use_enable iconv) \
-		$(use_enable iconv freetype) \
-		$(use_enable mad) \
-		$(use_enable png) \
-		$(use_enable vorbis) \
-		|| die
-}
-
-src_install() {
-	local f
-	for f in $(find . -type f -perm +1 -print); do
-		newgamesbin $f ${PN}-${f##*/} || die "newgamesbin $f failed"
-	done
-	dodoc README TODO
-	prepgamesdirs
-}