summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-rpg/arx-libertatis/ChangeLog6
-rw-r--r--games-rpg/arx-libertatis/Manifest19
-rw-r--r--games-rpg/arx-libertatis/arx-libertatis-1.1-r1.ebuild100
-rw-r--r--games-rpg/arx-libertatis/files/arx-libertatis-1.1-map-marker.patch32
4 files changed, 13 insertions, 144 deletions
diff --git a/games-rpg/arx-libertatis/ChangeLog b/games-rpg/arx-libertatis/ChangeLog
index c4c50455c2b0..b43dba806dd1 100644
--- a/games-rpg/arx-libertatis/ChangeLog
+++ b/games-rpg/arx-libertatis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-rpg/arx-libertatis
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.18 2013/07/19 19:46:48 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.19 2013/07/19 19:47:28 hasufell Exp $
+
+ 19 Jul 2013; Julian Ospald <hasufell@gentoo.org>
+ -arx-libertatis-1.1-r1.ebuild, -files/arx-libertatis-1.1-map-marker.patch:
+ remove old
*arx-libertatis-1.1.1 (19 Jul 2013)
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
index 6401822b2527..cc129836db0a 100644
--- a/games-rpg/arx-libertatis/Manifest
+++ b/games-rpg/arx-libertatis/Manifest
@@ -4,23 +4,20 @@ Hash: SHA256
AUX arx-data-copy 3090 SHA256 9f24928ec21c495147ff0c1c9fd88ab352fd300022bb0751d58b533a96d099d2 SHA512 dfbe8c97b9c7562062eb83f6558d23833a70ab8ca5e42f6cbadbdb97fd3e1cd4f568c415203e7c7aae36522187453f38304afac8a7e2cdc6f3288f76f915ffcb WHIRLPOOL 7db29955044aea81efc75958107d93d98b10d0170d654a8561361331d6f9038fb0ab0f7b2ac656067c67fddd91b80e1d4aec8f6b4ff2126939a565f4b135b788
AUX arx-libertatis-1.0.3-cmake2.8.patch 1025 SHA256 4deb878b260d9dd11b587ed4c710f11bf4a010dd1611a6335b851ff202536b66 SHA512 6d0fdde817aef14dc84513213dcc0a9de560082207f0ca06d618a65b73ae6b96c4249b8c062dc864075d763d9667f5fc815f553d889582590d69226d0db3ff8e WHIRLPOOL 7920c60e82af9db05cb621d7674cb83958b52ee7a5449a39091694440c8c73310128fa0e75bac82a2ecc1920ef3fbfddb1e1acdf268551a321ded145d981df22
AUX arx-libertatis-1.0.3-gentoo.patch 2009 SHA256 99ee2ac74a12adf7d614a1561e4eeced9adc5f6498c613e6e3cf6455913c333f SHA512 f92e51b4e14cefb35a0afb4a17a8e4a8c3ab816273c45fe89f7cf02197f5fd749d4547605e8eebd872dcf0b000b2fdc55a5e1c5442e93a9b6e3bd85362079909 WHIRLPOOL a93ef0ac90afd7e8830960c9929c1d7a8fb987e6cc1de30e78222267c5be13a93fcb95950f52f7ad79d91d41ff6ab9e2934322481595bedc25acab9ec73cd2fa
-AUX arx-libertatis-1.1-map-marker.patch 903 SHA256 a9585e64a4685f99e0bb56a3022e36c9ff162ab7e0a4ce0c7ae4086f3f43f311 SHA512 aa3bced7b564e40237dbf50f1298b3fcf34ca4e0c34b8f3e037f9216091884d0746b8a7df777fa09600db270f7eb0a906be658b77055ba75656160f3377155c9 WHIRLPOOL 7c8c31a349ea0fc9a336c3e7a9e4e37e3ed6694b33b1158a6da8e800d74ab747d1ebe8fd2196bccbbb2ce2de29a9ea5770fde6a5257fa7a9c9a75398b9804220
DIST arx-libertatis-1.0.3.tar.xz 912288 SHA256 5719e1602051f6a6dc13ac0366ff03804f914ffbd855e7e06fdeb0d065fb6d32 SHA512 e1e8d581b6a7928911abad124a6f9670c28f2a56bc7f7f3bae965f717977a0e9a3953514a663c3f7eb4a802cca8e5607feec829a3b7ffeccc83a835fd77a74b6 WHIRLPOOL 321ec489a474b9a63a762756d929371bd8c05ea5d2fa7994c597a86dc20009f385c5f8d23c1da5f978e9f358949a96bf23bf218245633fd5f4393294fbecee75
DIST arx-libertatis-1.1.1.tar.xz 970544 SHA256 d405047a78c520015f724b0b907ede55aadc787b5da91cf9967c08e70414d6c4 SHA512 9d6f2cdf029e0bfe19a6794ddbfe57f1cb88c4085d55f8b43cad740ef219d37dba3d47bd4a6bfd0cf0d5a58eabcb3304038430fe743e87d585e6d9620b1ce42c WHIRLPOOL 728f42a4a503dbe16e19cdc19551d224fd0a23aabeb56554947baa5fd40653d9779854a30cceff9094cf59d90d77c136bb15e4bb3d236da21897889168a3735a
-DIST arx-libertatis-1.1.tar.xz 970664 SHA256 881926668988c1997818f579d1513306a728e75a3bdd38aa0cf344084f6881f8 SHA512 ba8d5cfd45718c5b4738666cece224ffd4bc1d96ab9ab787c54582ca5edc62c1d826de5e32b01ebc7bf164c80d159107f3d037435996e202495fe3e69f1feca6 WHIRLPOOL b90263426f390ace67adb191f155f47bea996e108730982a1479792223a180be83c241bacd8a4cf652c564c38b5c535b55ebb5c40577210b6901eaccc4427bbc
EBUILD arx-libertatis-1.0.3.ebuild 2267 SHA256 c5633fd12847864dbe8b22af1c63427a299778629e2883182977df157c497ef9 SHA512 f9529ece9262247fb6c2ca389639df6bc35ababeee86b458bc03f192457857296074f25ed84ee2c7b16bebb692e3fb90456ee56e5dc21980d6f2d90394b8147b WHIRLPOOL b2038510559b4a418aa240df77d07d4595b7988b2ffc92a083a4121c6b5979ae29046505431ec652c20803f723d4e755bdb6ad2346eef7e94e1350dfef00a70d
-EBUILD arx-libertatis-1.1-r1.ebuild 2521 SHA256 310d085bad4ac863f781de16a3d5a0d19f01642ba25c13d09b48aab2b2349b87 SHA512 c52659ae075b287c1bc88d6d74ef4c5e61780b1e253a45853372b64015ba5172aae87365ba0cc58c1b4f18da9c85c1648e59dfa6bf758431023ab6d43f8f484c WHIRLPOOL 5e6a472d0ba468f49d9f0f6bc2bc38b9d7d93137bd2c953c0cb5b8a5508893f9a0e5df2df767702a1876d0f088dc7f1d7ad5dce644b732509734efe7d3a74aff
EBUILD arx-libertatis-1.1.1.ebuild 2471 SHA256 90cff2575078399b2d6e6ebf7f8d8709dd19fa5d64f6de56619992ecfab966ff SHA512 dd089f03cddf60cad93230d1760bd8980a3333ad11ef87ae9678a746d80b7041b78bfe07534781e6aa3ba110bed024ae770b1f4ae5455e022f34aaafc216b98b WHIRLPOOL 22a2d11369dcea83b26a85f82c73d00f90620e8d2b52ae31ca7211b864c8f559810c3cca50e49f9cf67a9f335053d624d21ef68eb25cd70f94a9275905253649
-MISC ChangeLog 2985 SHA256 c4e36ad7996fc46cfc50b1620061d389401df91eb7583e8e71b6fb44bd244540 SHA512 2a4d925a050121a2e1a27bc8a88585521000370543b8ad52a1ea2475869c578e21307aeca7d559320f99d6a78b8aad04e55c851024f6a210dbf936da9aa77cb9 WHIRLPOOL 1211b36106c219cfa95a0a9c9af1be0a7d21c3a56f2d19be69327d131fd561102b956c23248a6fb196e694f1f878a189ac42c78ac12732581133799d66e04453
+MISC ChangeLog 3127 SHA256 346e5a21c4f31eeebca8b6fd25a62ab399c87cc45472250fa937ca3597ff33e4 SHA512 a156b0f47ec191b187bf1c32c44ea317e2243f2ee7be85cdba3e43c628c18bd21135e27c9c1b9f2c27f179ce24236ee35e6424c9a083bffc5c6fdb76e6f29a05 WHIRLPOOL d92bf7faffc8c628350593072b17ca1f08a53bf60e5d9ba9301b86cc2b7ac061307ee736f9584c19d2d3b8515d04712efd193f2683df899993809f8eb420da70
MISC metadata.xml 2566 SHA256 6cb57882fec2064e146b87f683e8540fe03fc988a670fae67624d50b9bd83b39 SHA512 f5fc0020edaf8940006e48fa9e536dad576c8703143891769ebc80543f8233c70100f5e340047304eee68d89554be0c90bbf33e5a8539d69c561f91d77bbe26a WHIRLPOOL 484d02bf041975ef835289926ffc997ab20a713db376f8dbd93bdeed6e598556f33cf194f6d63656dbd5d57aac709e7a01a31f389eb10aa831a07596b85b2719
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJR6ZeqAAoJEFpvPKfnPDWzg90H/iQYsxI5zYd3fo7iIhLPBmL2
-U184YkjUJQNLVfHaYnJjq407N45loXO4zAq9oAYoKrpvMpKQkD6ZRtL8Jpwv2nsR
-NdGeWCMEiN2aOyRUiXzFSb+CRV9jVZkpD2O18sA7X4Urqz42anp2dXPcUrCA9x7v
-HDhZLWwBC4J7nAEFr1GLV5LpmMUBnK6jx+LvCD+RyoaaPlnOb+EgMk9euEAbCa1A
-0lF3vknn4S/k8ZYJEi6P6voFCzfkMll2ieKqAyqWTvUYa2yt9ncHq+DlIVjc3i80
-Ex0+D2wWx9+kLQ5UCy7/2S/ayKEmCSD4HS3vrkAhMIT6YgaQE2Xst/FojBxIIJs=
-=QCDl
+iQEcBAEBCAAGBQJR6ZfQAAoJEFpvPKfnPDWzd9wH/0QSaczrqzADYYu8fZZhOEhz
+egXJpPluChVLAHqXWOXXAHhaM6N0KnA5t4TQMWoSISwhKJ19Nkqkjse1YvoADZZt
+tTh3u0JYad7vwMBUpTToLCzn/Hp7+GRcoQIwLon9T/O6mwjrUPeTtzJaPxutggLC
+A0qlYw/rFAxEdhtiJ0t2Tmu8MzVu0G7JHlkfsZKnZ86Mn0ZxY0aX1BU9BBnFROWV
+AAnkjlzpVGXrlow4dX90ZMlCIBfKg3HbqMcUir48XXL/X3g4acpNoh8rEyZMVoPb
+ZebufEmIYgSTxo8ATuH6Xd7RxsjSulaQie2tFyezhHNclG3eGCuMUWB1OmQ6v8o=
+=1X0d
-----END PGP SIGNATURE-----
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1-r1.ebuild
deleted file mode 100644
index 137511957596..000000000000
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.1-r1.ebuild,v 1.1 2013/07/17 00:31:11 hasufell Exp $
-
-EAPI=5
-
-CMAKE_WARN_UNUSED_CLI=yes
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="http://arx-libertatis.org/"
-SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="c++0x debug +unity-build crash-reporter static tools"
-
-COMMON_DEPEND="
- media-libs/freetype
- media-libs/libsdl[X,video,opengl]
- media-libs/openal
- sys-libs/zlib
- virtual/opengl
- crash-reporter? (
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- )
- !static? ( media-libs/glew )"
-RDEPEND="${COMMON_DEPEND}
- crash-reporter? ( sys-devel/gdb )"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- virtual/pkgconfig
- static? ( media-libs/glew[static-libs] )"
-
-DOCS=( README.md AUTHORS CHANGELOG )
-
-PATCHES=( "${FILESDIR}"/${P}-map-marker.patch )
-
-src_configure() {
- # editor does not build
- local mycmakeargs=(
- $(cmake-utils_use_build crash-reporter CRASHREPORTER)
- -DBUILD_EDITOR=OFF
- $(cmake-utils_use_build tools TOOLS)
- -DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
- -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
- $(cmake-utils_use debug DEBUG)
- -DGAMESBINDIR="${GAMES_BINDIR}"
- -DICONDIR=/usr/share/icons/hicolor/128x128/apps
- -DINSTALL_SCRIPTS=ON
- -DSET_OPTIMIZATION_FLAGS=OFF
- -DSTRICT_USE=ON
- $(cmake-utils_use unity-build UNITY_BUILD)
- $(cmake-utils_use_use c++0x CXX11)
- -DUSE_NATIVE_FS=ON
- -DUSE_OPENAL=ON
- -DUSE_OPENGL=ON
- -DUSE_SDL=ON
- $(usex crash-reporter "-DUSE_QT5=OFF" "")
- $(cmake-utils_use_use static STATIC_LIBS)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- elog "optional dependencies:"
- elog " games-rpg/arx-fatalis-data (from CD or GOG)"
- elog " games-rpg/arx-fatalis-demo (free demo)"
- elog
- elog "This package only installs the game binary."
- elog "You need the demo or full game data. Also see:"
- elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
- elog
- elog "If you have already installed the game or use the STEAM version,"
- elog "run \"${GAMES_BINDIR}/arx-install-data\""
-
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.1-map-marker.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.1-map-marker.patch
deleted file mode 100644
index 7bc042723b1f..000000000000
--- a/games-rpg/arx-libertatis/files/arx-libertatis-1.1-map-marker.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e37b1efc4c2d9109625c3add80c04884ac9e2f3b Mon Sep 17 00:00:00 2001
-From: Daniel Scharrer <daniel@constexpr.org>
-Date: Wed, 17 Jul 2013 02:21:13 +0200
-Subject: [PATCH] Fix map marker labels not being saved
-
-Thanks to Eli2 for hunting down the offending change.
-
-See: commit d9662f
----
- src/scene/SaveFormat.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/scene/SaveFormat.h b/src/scene/SaveFormat.h
-index 7ffb17c..02e4b85 100644
---- a/src/scene/SaveFormat.h
-+++ b/src/scene/SaveFormat.h
-@@ -182,11 +182,12 @@ struct SavedMapMarkerData {
- s32 lvl;
- char name[STRING_SIZE];
-
-- /* implicit */ SavedMapMarkerData(const MiniMap::MapMarkerData &b) {
-+ /* implicit */ SavedMapMarkerData(const MiniMap::MapMarkerData & b) {
- x = b.m_x;
- y = b.m_y;
- lvl = b.m_lvl;
- arx_assert(STRING_SIZE > b.m_name.length());
-+ strcpy(name, b.m_name.c_str());
- }
-
- };
---
-1.8.1.6