version bump
authorMichael Sterrett <mr_bones_@gentoo.org>
Wed, 30 Nov 2011 07:59:38 +0000 (07:59 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Wed, 30 Nov 2011 07:59:38 +0000 (07:59 +0000)
Package-Manager: portage-2.1.10.11/cvs/Linux i686

games-strategy/freeciv/ChangeLog
games-strategy/freeciv/Manifest
games-strategy/freeciv/files/freeciv-2.2.5-clean-man.patch [deleted file]
games-strategy/freeciv/files/freeciv-2.2.7-clean-man.patch [deleted file]
games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch [new file with mode: 0644]
games-strategy/freeciv/freeciv-2.2.5.ebuild [deleted file]
games-strategy/freeciv/freeciv-2.3.1.ebuild [moved from games-strategy/freeciv/freeciv-2.2.7.ebuild with 93% similarity]

index 0b017d9764433b2966ea1d5b447c3849b8fdd7c0..769e86eee0aad73edd68fafdfc1b22bcffbd7aa6 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.130 2011/10/08 16:32:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.131 2011/11/30 07:59:37 mr_bones_ Exp $
+
+*freeciv-2.3.1 (30 Nov 2011)
+
+  30 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> -freeciv-2.2.5.ebuild,
+  -files/freeciv-2.2.5-clean-man.patch, -freeciv-2.2.7.ebuild,
+  -files/freeciv-2.2.7-clean-man.patch, +freeciv-2.3.1.ebuild,
+  +files/freeciv-2.3.1-clean-man.patch:
+  version bump
 
   08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> freeciv-2.3.0.ebuild:
   x86 stable wrt bug #385899
index 7dc62bcf829aae1769c110972ff80f895ba8d055..adcd6113e361bf789efb3a8be92e21e0fe1a2931 100644 (file)
@@ -1,21 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX freeciv-2.2.5-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
-AUX freeciv-2.2.7-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
 AUX freeciv-2.3.0-clean-man.patch 479 RMD160 e25fc28ad471ed1025ee0dc2538acf2c680ffdbb SHA1 44ea881b066c865120952ab278a601fabc705de8 SHA256 6adfae4f3832aac79e794b4ec584b25491efed0bad7d26b0dcdc76db42881eaf
-DIST freeciv-2.2.5.tar.bz2 35170438 RMD160 7f34e0d9c3ece7012665b1d1e4ae0be73759596b SHA1 b204c4ae581be632fd2385517ada62558d48e702 SHA256 9bd8bb20ae439d0cdfce8262fb44de33155c698cd15847bef32f8f28a9aad236
-DIST freeciv-2.2.7.tar.bz2 35094644 RMD160 a1114cd9805dfeeab238071f9b7736b948474dde SHA1 b7cf680a25e9006cb3a289a2e5c786dd385577cb SHA256 993dd1685dad8012225fdf434673515a194fa072b3d5bfb04952a98fb862d319
+AUX freeciv-2.3.1-clean-man.patch 479 RMD160 e25fc28ad471ed1025ee0dc2538acf2c680ffdbb SHA1 44ea881b066c865120952ab278a601fabc705de8 SHA256 6adfae4f3832aac79e794b4ec584b25491efed0bad7d26b0dcdc76db42881eaf
 DIST freeciv-2.3.0.tar.bz2 30239019 RMD160 1f017139c5ac4c24d1b4b6767aca84e18b9db31b SHA1 d4e871ad749e1807957df4e353fbb8f5510b7248 SHA256 f380f7f89a3478e8b2a68033b37325539248618508d94edf55b84e5e979fbefa
-EBUILD freeciv-2.2.5.ebuild 3261 RMD160 9f3cef58e12d2d5955fb7c877e7cd1116c7ea3ac SHA1 ecb06388bff5ac25f2b08fa0c5ffd4fa5f458e76 SHA256 a8ea2e8f61244407d0059d2988376bc62be071e60e707ded7c2ca46d978758a9
-EBUILD freeciv-2.2.7.ebuild 3261 RMD160 48fa8c8b8431ab1f339aa5d2f72a0ef250b69b4a SHA1 01e26a2b87ba3d2552903dee5c8eba0210ec19d9 SHA256 458fb8873a65e2657b5868259750bd4c2f8b1c9a6a44524d503f48a8d85a5bf0
+DIST freeciv-2.3.1.tar.bz2 30528325 RMD160 84bb3f0381284b003a34c5a659f013c4fc75a3c4 SHA1 9d9ee9f48f4c945fc6525139d340443d5a25aac4 SHA256 236686fc7f9cf387aba26b6919a87a791fb23e8aabb19181823349983c986ad8
 EBUILD freeciv-2.3.0.ebuild 3271 RMD160 ee7261bb17903317508814ba814f7bfc94332ded SHA1 b8c1cb9af01650963c7403589c69beb70152c87e SHA256 1bee66dcf7c4aecd2ca25e48c34535edb44cbd9b8719f6d9bfd948f3a67b872a
-MISC ChangeLog 18662 RMD160 cf037fe2527b609b0b7014a984ed9b523760bbdb SHA1 040e16df53acd2fd515ca69bf6b57bbd72613a82 SHA256 9ba907b455c8484f1fdd6c886c1cb5e2db7c8d184741d9b8ee173371d72cd54a
+EBUILD freeciv-2.3.1.ebuild 3297 RMD160 298938f7ce318497ad30d6696bbf2f4df135a984 SHA1 335a0366bc3ccdaea1d0e1557705ee55052673de SHA256 7a081ef6025cd4a6882d965538443376f95decd61964538da73ba4f3f3ebc9e0
+MISC ChangeLog 18951 RMD160 0109c9f4e4e5a8cd810548b5ade91fdc89784aa9 SHA1 e197f8bc0692ef6fca25689b0ed5c3bcac15ba65 SHA256 f82af0a07cde3d03023a67811ebb53454756f3fd8c531172240484ded5414519
 MISC metadata.xml 389 RMD160 8df0338ed8960825740eb0a12e30725d238855dd SHA1 dcf97dda6c3ca4a024638c1f42914084d4d67984 SHA256 f235b6ab122a8aaaee297ee34fe84b294bd2b015ce8cde7c772a387585992f2f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk6Qez8ACgkQuUQtlDBCeQJxaACfRF0PCHq/DJ7iJC1bsYiR996I
-X2gAn1u9Rvb6iQYaTwG5bweohCXx0ykK
-=4pqm
------END PGP SIGNATURE-----
diff --git a/games-strategy/freeciv/files/freeciv-2.2.5-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.2.5-clean-man.patch
deleted file mode 100644 (file)
index b5c4d23..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru freeciv-2.2.0.orig/doc/man/Makefile.in freeciv-2.2.0/doc/man/Makefile.in
---- freeciv-2.2.0.orig/doc/man/Makefile.in     2010-02-21 13:52:28.000000000 -0500
-+++ freeciv-2.2.0/doc/man/Makefile.in  2010-02-26 04:00:07.713504939 -0500
-@@ -347,8 +347,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- MAN_PAGES = \
--      freeciv-server.6        \
--      freeciv-client.6
-+      freeciv-server.6
- 
- MAN_LINKS = \
-       freeciv-gtk2.6          \
-@@ -357,7 +356,7 @@
-       freeciv-win32.6         \
-       freeciv-ftwl.6
- 
--man_MANS = $(MAN_PAGES) $(MAN_LINKS)
-+man_MANS = $(MAN_PAGES)
- EXTRA_DIST = $(man_MANS)
- all: all-am
- 
diff --git a/games-strategy/freeciv/files/freeciv-2.2.7-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.2.7-clean-man.patch
deleted file mode 100644 (file)
index b5c4d23..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru freeciv-2.2.0.orig/doc/man/Makefile.in freeciv-2.2.0/doc/man/Makefile.in
---- freeciv-2.2.0.orig/doc/man/Makefile.in     2010-02-21 13:52:28.000000000 -0500
-+++ freeciv-2.2.0/doc/man/Makefile.in  2010-02-26 04:00:07.713504939 -0500
-@@ -347,8 +347,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- MAN_PAGES = \
--      freeciv-server.6        \
--      freeciv-client.6
-+      freeciv-server.6
- 
- MAN_LINKS = \
-       freeciv-gtk2.6          \
-@@ -357,7 +356,7 @@
-       freeciv-win32.6         \
-       freeciv-ftwl.6
- 
--man_MANS = $(MAN_PAGES) $(MAN_LINKS)
-+man_MANS = $(MAN_PAGES)
- EXTRA_DIST = $(man_MANS)
- all: all-am
- 
diff --git a/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch
new file mode 100644 (file)
index 0000000..ebac814
--- /dev/null
@@ -0,0 +1,21 @@
+--- doc/man/Makefile.in.orig   2011-08-19 14:54:02.163463916 -0400
++++ doc/man/Makefile.in        2011-08-19 14:54:31.354583970 -0400
+@@ -360,8 +360,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ MAN_PAGES = \
+-      freeciv-server.6        \
+-      freeciv-client.6
++      freeciv-server.6
+ 
+ MAN_LINKS = \
+       freeciv-gtk2.6          \
+@@ -370,7 +369,7 @@
+       freeciv-win32.6         \
+       freeciv-ftwl.6
+ 
+-man_MANS = $(MAN_PAGES) $(MAN_LINKS)
++man_MANS = $(MAN_PAGES)
+ EXTRA_DIST = $(MAN_LINKS)
+ all: all-am
+ 
diff --git a/games-strategy/freeciv/freeciv-2.2.5.ebuild b/games-strategy/freeciv/freeciv-2.2.5.ebuild
deleted file mode 100644 (file)
index 50ea8cc..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.5.ebuild,v 1.2 2011/05/05 11:02:15 phajdan.jr Exp $
-
-EAPI=2
-inherit eutils gnome2-utils games-ggz games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
-IUSE="auth dedicated ggz gtk ipv6 nls readline sdl +sound"
-
-RDEPEND="readline? ( sys-libs/readline )
-       sys-libs/zlib
-       app-arch/bzip2
-       auth? ( virtual/mysql )
-       !dedicated? (
-               nls? ( virtual/libintl )
-               gtk? ( x11-libs/gtk+:2 )
-               sdl? (
-                       media-libs/libsdl[video]
-                       media-libs/sdl-image[png]
-                       media-libs/freetype
-               )
-               !gtk? ( !sdl? ( x11-libs/gtk+:2 ) )
-               sound? (
-                       media-libs/libsdl[audio]
-                       media-libs/sdl-mixer
-               )
-               ggz? ( games-board/ggz-gtk-client )
-               media-libs/libpng
-       )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       !dedicated? (
-               nls? ( sys-devel/gettext )
-               x11-proto/xextproto
-       )"
-
-src_prepare() {
-       # install the .desktop in /usr/share/applications
-       # install the icons in /usr/share/pixmaps
-       sed -i \
-               -e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \
-               -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-               -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-               client/Makefile.in \
-               server/Makefile.in \
-               data/Makefile.in \
-               data/icons/Makefile.in \
-               || die "sed failed"
-
-       # remove civclient manpage if dedicated server
-       if use dedicated ; then
-               epatch "${FILESDIR}"/${P}-clean-man.patch
-       fi
-}
-
-src_configure() {
-       local myclient myopts
-
-       if use dedicated ; then
-               myclient="no"
-       else
-               use sdl && myclient="${myclient} sdl"
-               use gtk && myclient="${myclient} gtk"
-               [[ -z ${myclient} ]] && myclient="gtk" # default to gtk if none specified
-               myopts=$(use_with ggz ggz-client)
-       fi
-
-       egamesconf \
-               --disable-dependency-tracking \
-               --localedir=/usr/share/locale \
-               --with-ggzconfig=/usr/bin \
-               --enable-noregistry="${GGZ_MODDIR}" \
-               $(use_enable auth) \
-               $(use_enable ipv6) \
-               $(use_enable nls) \
-               $(use_with readline) \
-               $(use_enable sound sdl-mixer) \
-               ${myopts} \
-               --enable-client="${myclient}"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       if ! use dedicated ; then
-               # Create and install the html manual. It can't be done for dedicated
-               # servers, because the 'civmanual' tool is then not built. Also
-               # delete civmanual from the GAMES_BINDIR, because it's then useless.
-               # Note: to have it localized, it should be ran from _postinst, or
-               # something like that, but then it's a PITA to avoid orphan files...
-               ./manual/civmanual || die "civmanual failed"
-               dohtml manual*.html || die "dohtml failed"
-               rm -f "${D}/${GAMES_BINDIR}"/civmanual
-               use sdl && make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-       fi
-
-       dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
-       rm -rf "${D}$(games_get_libdir)"
-
-       prepgamesdirs
-}
-
-pkg_preinst() {
-       games_pkg_preinst
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       games_pkg_postinst
-       games-ggz_update_modules
-       gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-       games-ggz_update_modules
-       gnome2_icon_cache_update
-}
similarity index 93%
rename from games-strategy/freeciv/freeciv-2.2.7.ebuild
rename to games-strategy/freeciv/freeciv-2.3.1.ebuild
index b9e5bba9d6d2c2127c8dc684f9afc3039178777e..9a850dde75c26b357459eb459aef843a71530806 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.7.ebuild,v 1.1 2011/08/03 16:28:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.3.1.ebuild,v 1.1 2011/11/30 07:59:37 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils gnome2-utils games-ggz games
@@ -45,11 +45,12 @@ src_prepare() {
        # install the .desktop in /usr/share/applications
        # install the icons in /usr/share/pixmaps
        sed -i \
-               -e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \
+               -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
                -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
                -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
                client/Makefile.in \
                server/Makefile.in \
+               modinst/Makefile.in \
                data/Makefile.in \
                data/icons/Makefile.in \
                || die "sed failed"
@@ -95,7 +96,7 @@ src_install() {
                # delete civmanual from the GAMES_BINDIR, because it's then useless.
                # Note: to have it localized, it should be ran from _postinst, or
                # something like that, but then it's a PITA to avoid orphan files...
-               ./manual/civmanual || die "civmanual failed"
+               ./manual/freeciv-manual || die "freeciv-manual failed"
                dohtml manual*.html || die "dohtml failed"
                rm -f "${D}/${GAMES_BINDIR}"/civmanual
                use sdl && make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client