From: Sebastien Fabbro Date: Mon, 12 Feb 2007 22:44:20 +0000 (+0000) Subject: celestia-1.4.1-r2 with a bunch of fixes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c08cc1f1276fb9f2607928e3ec31cb61a703c7d;p=gentoo.git celestia-1.4.1-r2 with a bunch of fixes Package-Manager: portage-2.1.2-r9 --- diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog index 4d47859d295b..cc560f7eeda8 100644 --- a/sci-astronomy/celestia/ChangeLog +++ b/sci-astronomy/celestia/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sci-astronomy/celestia # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.27 2007/02/06 10:18:36 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.28 2007/02/12 22:44:20 bicatali Exp $ + +*celestia-1.4.1-r2 (12 Feb 2007) + + 12 Feb 2007; Sébastien Fabbro + +files/celestia-1.4.1-3dsmodels.patch, + +files/celestia-1.4.1-as-needed.patch, + files/celestia-1.4.1-kde-datadir.patch, + +files/celestia-1.4.1-locale.patch, files/celestia-1.4.1-lua51.patch, + -celestia-1.4.1-r1.ebuild, +celestia-1.4.1-r2.ebuild: + Fix for bug #130091 (real this time), bug #166362. Cleaned the ebuild + and removed older buggy revision. 06 Feb 2007; Sébastien Fabbro -files/celestia-1.4.1-lua.patch, celestia-1.4.1-r1.ebuild: diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest index 583be77d0549..6409fa26b9da 100644 --- a/sci-astronomy/celestia/Manifest +++ b/sci-astronomy/celestia/Manifest @@ -5,6 +5,14 @@ AUX celestia-1.3.2-noarts.patch 3566 RMD160 32cc8eacfe3cd571d8d16ab99730436e9803 MD5 f659f2616eeaaa4d3b6422e586d2bfa2 files/celestia-1.3.2-noarts.patch 3566 RMD160 32cc8eacfe3cd571d8d16ab99730436e98033e6e files/celestia-1.3.2-noarts.patch 3566 SHA256 d6e58016dca095d949b6492aeb12fa8b881ae1b47ac2858ff89f20b393b912ad files/celestia-1.3.2-noarts.patch 3566 +AUX celestia-1.4.1-3dsmodels.patch 339 RMD160 a7a8dccf16476dc735c8af2fdea99bd5170f5e7a SHA1 4fa3fa941c944579955be460350aeb26ec329ae2 SHA256 79ae1fabb8b9f5683d483fb74975ea04576cd27d4c8e8a159119e8d85fe61dde +MD5 f4b2dd94891993478ba04e72ba91345e files/celestia-1.4.1-3dsmodels.patch 339 +RMD160 a7a8dccf16476dc735c8af2fdea99bd5170f5e7a files/celestia-1.4.1-3dsmodels.patch 339 +SHA256 79ae1fabb8b9f5683d483fb74975ea04576cd27d4c8e8a159119e8d85fe61dde files/celestia-1.4.1-3dsmodels.patch 339 +AUX celestia-1.4.1-as-needed.patch 406 RMD160 3d466263828351e668858ab0d3d66219fa6d2e91 SHA1 5263f2815101e2f417e6c94402365fa1f705cd90 SHA256 369e0a679fba546d85bc8ab41abe72180568f210c55f333dc5c67b38a1e5e705 +MD5 dfd08dea295e7698dc87ed34c196af00 files/celestia-1.4.1-as-needed.patch 406 +RMD160 3d466263828351e668858ab0d3d66219fa6d2e91 files/celestia-1.4.1-as-needed.patch 406 +SHA256 369e0a679fba546d85bc8ab41abe72180568f210c55f333dc5c67b38a1e5e705 files/celestia-1.4.1-as-needed.patch 406 AUX celestia-1.4.1-cfg.patch 425 RMD160 58ee9017aa389ffd0aa3eeafa2760e8470f8190c SHA1 20183c664d0c62b2e04c0f0ca09eb59c80b4da13 SHA256 5f3ac8eba91d5491d8500c7f25b2c324d03e9a6a6d5641a1ba62086ddca0d374 MD5 22a1bf9a9a88862f7836f98fe52cdab1 files/celestia-1.4.1-cfg.patch 425 RMD160 58ee9017aa389ffd0aa3eeafa2760e8470f8190c files/celestia-1.4.1-cfg.patch 425 @@ -13,14 +21,18 @@ AUX celestia-1.4.1-gcc-4.1.patch 1191 RMD160 b9bfae5bc1b5bf93a95760e3fd558645668 MD5 5f63556bba262455321ec2a466ef3bf8 files/celestia-1.4.1-gcc-4.1.patch 1191 RMD160 b9bfae5bc1b5bf93a95760e3fd558645668cdca6 files/celestia-1.4.1-gcc-4.1.patch 1191 SHA256 ea26fe154cf92c613c54edd5e0e51c1b8562ee5ccd74ab191a8a386cd8986e67 files/celestia-1.4.1-gcc-4.1.patch 1191 -AUX celestia-1.4.1-kde-datadir.patch 1505 RMD160 5acdbeab92d61aeb086e1cc30723daa1ccda5556 SHA1 7825bec1492442939e10c5022da6acb9ebed4506 SHA256 f37a80bd089cc0918bbf50760207993aeafb50bafd2c331ad6e0ea214b448646 -MD5 c55b09c7339307e1d94bc60f46e82365 files/celestia-1.4.1-kde-datadir.patch 1505 -RMD160 5acdbeab92d61aeb086e1cc30723daa1ccda5556 files/celestia-1.4.1-kde-datadir.patch 1505 -SHA256 f37a80bd089cc0918bbf50760207993aeafb50bafd2c331ad6e0ea214b448646 files/celestia-1.4.1-kde-datadir.patch 1505 -AUX celestia-1.4.1-lua51.patch 2411 RMD160 f2a7385f9582ddfa7fc294a776dcd1fea604c580 SHA1 12367dfd5af70d56bfdfb99068e709d89b45dcec SHA256 d311cbd81546221409bea8256c9fc12b1a6da2e504523e39520c28280585b248 -MD5 bf2d3516c6a46ace35d18fc4692aba36 files/celestia-1.4.1-lua51.patch 2411 -RMD160 f2a7385f9582ddfa7fc294a776dcd1fea604c580 files/celestia-1.4.1-lua51.patch 2411 -SHA256 d311cbd81546221409bea8256c9fc12b1a6da2e504523e39520c28280585b248 files/celestia-1.4.1-lua51.patch 2411 +AUX celestia-1.4.1-kde-datadir.patch 1672 RMD160 9d5bc7d059e84a8f5212c37088fdd14e4fc85c80 SHA1 1e191da1b8b2ae7e054c6324b55530b7d8f8f278 SHA256 668888ede1c67c170ef47ad4959eb7cd2d618a493ecaf36889a4eec6ca52234e +MD5 6ddb9dff14b182c853c5d3b1f83ac3ce files/celestia-1.4.1-kde-datadir.patch 1672 +RMD160 9d5bc7d059e84a8f5212c37088fdd14e4fc85c80 files/celestia-1.4.1-kde-datadir.patch 1672 +SHA256 668888ede1c67c170ef47ad4959eb7cd2d618a493ecaf36889a4eec6ca52234e files/celestia-1.4.1-kde-datadir.patch 1672 +AUX celestia-1.4.1-locale.patch 7373 RMD160 1ca4a9d612b6c2d0f2bc2800ff3ed1b6b19da20c SHA1 3fbdf528c19a4bd49db6e1ce340ca8b06c323540 SHA256 0c609de10544afeefddc141b8efbec743317fee363a3af180dfb4df368b51b45 +MD5 2f96218e3f704a7b85c621431a1b7704 files/celestia-1.4.1-locale.patch 7373 +RMD160 1ca4a9d612b6c2d0f2bc2800ff3ed1b6b19da20c files/celestia-1.4.1-locale.patch 7373 +SHA256 0c609de10544afeefddc141b8efbec743317fee363a3af180dfb4df368b51b45 files/celestia-1.4.1-locale.patch 7373 +AUX celestia-1.4.1-lua51.patch 2351 RMD160 8c16ce1594bb789521c07c8a14e3738676ca88a4 SHA1 6d49c3e0560e89480d09d431f9b65813f4c408c5 SHA256 4fef305ef77a1cd7f3044288e806914360ff77092bd29416a8ed06a48d1f91ac +MD5 be81e2bdb0013668f7c15da6c2d67aad files/celestia-1.4.1-lua51.patch 2351 +RMD160 8c16ce1594bb789521c07c8a14e3738676ca88a4 files/celestia-1.4.1-lua51.patch 2351 +SHA256 4fef305ef77a1cd7f3044288e806914360ff77092bd29416a8ed06a48d1f91ac files/celestia-1.4.1-lua51.patch 2351 AUX celestia-1.4.1-strictalias.patch 367 RMD160 b3f79ab12e78d742adb9e8e6f71d4df25b444404 SHA1 a0623106c9428522982429f281e844d9d7f5c98f SHA256 f38398fef7dd604669e84e46ffe1cbe6514ada92f581b5b30ac0965223d3db54 MD5 298430529ddf2fbf0704ad59ac2a9f3a files/celestia-1.4.1-strictalias.patch 367 RMD160 b3f79ab12e78d742adb9e8e6f71d4df25b444404 files/celestia-1.4.1-strictalias.patch 367 @@ -39,18 +51,18 @@ EBUILD celestia-1.3.2.ebuild 3063 RMD160 3693e0d7a28a52d9445c9d92b3693f4ad190e7d MD5 6be90f964bc6ca0195b0623338dfd1f0 celestia-1.3.2.ebuild 3063 RMD160 3693e0d7a28a52d9445c9d92b3693f4ad190e7d3 celestia-1.3.2.ebuild 3063 SHA256 9f810428bc0a312a687de0cf42e5053947015fa0bf9a0d93ef90b2a9f112a46b celestia-1.3.2.ebuild 3063 -EBUILD celestia-1.4.1-r1.ebuild 3867 RMD160 a9146770be8baafd25189906c18c45ac5c78db10 SHA1 bad204b2545cdc9fbb1abf7ad254a118e318eb51 SHA256 252be1844356bced884b1f83c3ff6add343412a243573cb4f9db5194e285aab7 -MD5 f70b532c0f67f5d0b81494578269a841 celestia-1.4.1-r1.ebuild 3867 -RMD160 a9146770be8baafd25189906c18c45ac5c78db10 celestia-1.4.1-r1.ebuild 3867 -SHA256 252be1844356bced884b1f83c3ff6add343412a243573cb4f9db5194e285aab7 celestia-1.4.1-r1.ebuild 3867 +EBUILD celestia-1.4.1-r2.ebuild 3818 RMD160 fe71c7c3f9e52ac35b76b27a3e9be32f62e1c094 SHA1 f8ca1c2dccf04e50feb335e16bea29c7b881fe36 SHA256 3b766369f36b974cd5ca520631bacd0bbe7c853a065e82b54ed39285bc9cab63 +MD5 1c819b6e7dda12eea7c1f14d742b46e1 celestia-1.4.1-r2.ebuild 3818 +RMD160 fe71c7c3f9e52ac35b76b27a3e9be32f62e1c094 celestia-1.4.1-r2.ebuild 3818 +SHA256 3b766369f36b974cd5ca520631bacd0bbe7c853a065e82b54ed39285bc9cab63 celestia-1.4.1-r2.ebuild 3818 EBUILD celestia-1.4.1.ebuild 3325 RMD160 c163639d827920811307a577d8a9dd6b549a5bfe SHA1 a3a5596d735afd4d3afdb18307e3dd9a3a163a05 SHA256 79206ce994a215f5a7e88134fd77b1be5fd500e1da33b406af0548082b1655d7 MD5 e9c88cb97f349dc353289850713ba793 celestia-1.4.1.ebuild 3325 RMD160 c163639d827920811307a577d8a9dd6b549a5bfe celestia-1.4.1.ebuild 3325 SHA256 79206ce994a215f5a7e88134fd77b1be5fd500e1da33b406af0548082b1655d7 celestia-1.4.1.ebuild 3325 -MISC ChangeLog 9569 RMD160 fde4b365b1ada0ee8d22f35baa8e8830e1c30acc SHA1 ed81143fb5b9b4a794a234f2724466f253a66a8b SHA256 27311e6d6fa5b4041420b0453996d45fe09c302dd64084f73b381efa0ee2c0c7 -MD5 73fe90c3d0fb179af67354f1261b27d0 ChangeLog 9569 -RMD160 fde4b365b1ada0ee8d22f35baa8e8830e1c30acc ChangeLog 9569 -SHA256 27311e6d6fa5b4041420b0453996d45fe09c302dd64084f73b381efa0ee2c0c7 ChangeLog 9569 +MISC ChangeLog 10020 RMD160 4f1980c5ef420c03d3c01485f3cc7ff2c8c0c234 SHA1 c45753d248f30e26f2d845a0109a8c882ae0bc7d SHA256 18895058d32773bfbc572655f2b4f570b9f4008431bd73cc22344fc8c5b33a14 +MD5 4fa46fff79f053aa3ba96c893e8d3ae8 ChangeLog 10020 +RMD160 4f1980c5ef420c03d3c01485f3cc7ff2c8c0c234 ChangeLog 10020 +SHA256 18895058d32773bfbc572655f2b4f570b9f4008431bd73cc22344fc8c5b33a14 ChangeLog 10020 MISC metadata.xml 705 RMD160 e20a8f5e0de56e9fa102864cab202a0af6b5172c SHA1 712d9a3efc45acc1873bb2ac49cb00e7d6bf59bf SHA256 bd067e5762b23475ca10fd83e68015c504345c929c45174f50fd8ccd48ad12eb MD5 4f929f451f87254297e07e7c46707c1c metadata.xml 705 RMD160 e20a8f5e0de56e9fa102864cab202a0af6b5172c metadata.xml 705 @@ -61,13 +73,13 @@ SHA256 fdacc425387c3b609b1a8e003439862a7373035fe793b38c4824f35a7b5e0218 files/di MD5 34161bf1fac09b84a3ffe3d187aa811d files/digest-celestia-1.4.1 250 RMD160 b55d9c21cfda86365a1be8dcf84705ca0381ac9a files/digest-celestia-1.4.1 250 SHA256 d638e17dad65f179f89102c209ecffc06c9383a96420f7a9c31a9cabba357fdf files/digest-celestia-1.4.1 250 -MD5 34161bf1fac09b84a3ffe3d187aa811d files/digest-celestia-1.4.1-r1 250 -RMD160 b55d9c21cfda86365a1be8dcf84705ca0381ac9a files/digest-celestia-1.4.1-r1 250 -SHA256 d638e17dad65f179f89102c209ecffc06c9383a96420f7a9c31a9cabba357fdf files/digest-celestia-1.4.1-r1 250 +MD5 34161bf1fac09b84a3ffe3d187aa811d files/digest-celestia-1.4.1-r2 250 +RMD160 b55d9c21cfda86365a1be8dcf84705ca0381ac9a files/digest-celestia-1.4.1-r2 250 +SHA256 d638e17dad65f179f89102c209ecffc06c9383a96420f7a9c31a9cabba357fdf files/digest-celestia-1.4.1-r2 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFyFYKWc/Ciu+QQGkRAoGxAJ4jhYf+5teSkNFyGjvfMirNsjekpwCfdJXw -PIs0cEpYiM0AMXdS1qjWAVw= -=6C0D +iD8DBQFF0O3PWc/Ciu+QQGkRAggtAJ4jLwIDKaXLUNnlCM75y9/gCDzcjACgh9+b +PSqcfHUleq9d2Gs0RzP7fYg= +=jMQV -----END PGP SIGNATURE----- diff --git a/sci-astronomy/celestia/celestia-1.4.1-r1.ebuild b/sci-astronomy/celestia/celestia-1.4.1-r2.ebuild similarity index 75% rename from sci-astronomy/celestia/celestia-1.4.1-r1.ebuild rename to sci-astronomy/celestia/celestia-1.4.1-r2.ebuild index 4cdc86afff66..9f8b21bc29ec 100644 --- a/sci-astronomy/celestia/celestia-1.4.1-r1.ebuild +++ b/sci-astronomy/celestia/celestia-1.4.1-r2.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.4.1-r1.ebuild,v 1.3 2007/02/06 10:18:36 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.4.1-r2.ebuild,v 1.1 2007/02/12 22:44:20 bicatali Exp $ -#WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" inherit eutils flag-o-matic gnome2 kde-functions autotools -DESCRIPTION="Space 3D simulator" +DESCRIPTION="OpenGL 3D space simulator" HOMEPAGE="http://www.shatters.net/celestia/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -65,36 +64,49 @@ pkg_setup() { src_unpack() { unpack ${A} + cd "${S}" + # some lua patches to make it work for lua-5.1 has_version ">=dev-lang/lua-5.1.1" && \ epatch "${FILESDIR}/${P}-lua51.patch" - cd "${S}" + # standard set of gcc-4.1 patches epatch "${FILESDIR}/${P}-gcc-4.1.patch" + # fix kde datadir in makefile.am and .desktop location epatch "${FILESDIR}/${P}-kde-datadir.patch" + # add a ~/.celestia for extra directories epatch "${FILESDIR}/${P}-cfg.patch" - # strict aliasing from mandriva + + # strict aliasing from fedora epatch "${FILESDIR}/${P}-strictalias.patch" - # remove agressive flags to let the user decide - sed -i \ - -e 's/-ffast-math -fexpensive-optimizations//g' \ - configure.in || die "sed failed" + # install 3ds models by requests + epatch "${FILESDIR}/${P}-3dsmodels.patch" + + # fix po/Makefile.in.in to regenerate + epatch "${FILESDIR}/${P}-locale.patch" - # remove an unused gconf macro killing autoconf + # fix for as-needed (bug #130091) + epatch "${FILESDIR}/${P}-as-needed.patch" + + # remove flags to let the user decide + for cf in -O2 -ffast-math \ + -fexpensive-optimizations \ + -fomit-frame-pointer; do + sed -i \ + -e "s/${cf}//g" \ + configure.in || die "sed failed" + done + + # remove an unused gconf macro killing autoconf when no gnome if ! use gnome; then sed -i \ -e '/AM_GCONF_SOURCE_2/d' \ configure.in || die "sed failed" fi - # nasty hack for gettext generated file - sed -i \ - -e 's:@MKINSTALLDIRS@:$(top_builddir)/admin/mkinstalldirs:' \ - po/Makefile.in.in || die "sed failed" - eautoreconf } @@ -103,7 +115,7 @@ src_compile() { if [[ "${mygui}" == "kde" ]]; then set-kdedir 3 set-qtdir 3 - export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer" + export kde_widgetdir="${KDEDIR}/lib/kde3/plugins/designer" fi addwrite ${QTDIR}/etc/settings @@ -123,22 +135,16 @@ src_compile() { } src_install() { - #dodir /usr/share/celestia if [[ "${mygui}" == "gnome" ]]; then gnome2_src_install else - #einstall || die "einstall failed" emake DESTDIR="${D}" install || die "emake install failed" for size in 16 22 32 48 ; do - insinto /usr/share/icons/hicolor/${size}x${size}/apps/ + insinto /usr/share/icons/hicolor/${size}x${size}/apps newins ${S}/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png done fi - dodoc AUTHORS README TODO NEWS TRANSLATORS ChangeLog \ - CelestiaKeyAssignments.txt KbdMouseJoyControls.txt devguide.txt - dohtml coding-standards.html manual/*.html manual/*.css - insinto /usr/share/celestia/models/ - for m in models/*.3ds; do - doins ${m} - done + dodoc AUTHORS README TODO NEWS TRANSLATORS *.txt + dohtml coding-standards.html + dosym "${PORTDIR}"/licenses/GPL-2 /usr/share/${PN}/COPYING } diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-3dsmodels.patch b/sci-astronomy/celestia/files/celestia-1.4.1-3dsmodels.patch new file mode 100644 index 000000000000..d7287c69680f --- /dev/null +++ b/sci-astronomy/celestia/files/celestia-1.4.1-3dsmodels.patch @@ -0,0 +1,14 @@ +--- models/Makefile.am 2006-02-02 04:12:26.000000000 +0000 ++++ models/Makefile.am.new 2007-02-12 14:20:19.000000000 +0000 +@@ -3,8 +3,8 @@ + pkgdata_DATA = \ + $(wildcard *.cms) \ + $(wildcard *.cmod) \ +- $(wildcard *.pts) ++ $(wildcard *.pts) \ ++ $(wildcard *.3ds) + + EXTRA_DIST = \ +- $(pkgdata_DATA) \ +- $(wildcard *.3ds) ++ $(pkgdata_DATA) diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-as-needed.patch b/sci-astronomy/celestia/files/celestia-1.4.1-as-needed.patch new file mode 100644 index 000000000000..e9ab3faacd7b --- /dev/null +++ b/sci-astronomy/celestia/files/celestia-1.4.1-as-needed.patch @@ -0,0 +1,10 @@ +--- src/celestia/Makefile.am 2006-01-16 02:05:25.000000000 +0000 ++++ src/celestia/Makefile.am.new 2007-02-12 21:23:56.000000000 +0000 +@@ -11,6 +11,7 @@ + celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ + $(LIBSOCKET) kde/libkdegui.a + celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) + endif + + if ENABLE_GTK diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch b/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch index 48912f2e2c15..8b4edc9663bb 100644 --- a/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch +++ b/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch @@ -1,26 +1,34 @@ diff -Nur ../celestia-1.4.1.orig/Makefile.am ./Makefile.am --- ../celestia-1.4.1.orig/Makefile.am 2006-02-03 18:04:33.000000000 +0000 -+++ ./Makefile.am 2007-02-03 12:46:33.000000000 +0000 -@@ -66,11 +66,11 @@ ++++ ./Makefile.am 2007-02-12 19:49:21.000000000 +0000 +@@ -15,7 +15,6 @@ + pkgdata_DATA = \ + celestia.cfg \ + controls.txt \ +- COPYING \ + $(wildcard *.cel) + + EXTRA_DIST = \ +@@ -66,11 +65,11 @@ ) install-data-hook: - if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \ - mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \ - rmdir $(kde_datadir)/@PACKAGE@ ; \ -+ if [ "$(DESTDIR)$(kde_datadir)" -a -d $(DESTDIR)$(kde_datadir)/@PACKAGE@ -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \ ++ if [ -n "$(kde_datadir)" -a "$(DESTDIR)$(kde_datadir)" -a -d $(DESTDIR)$(kde_datadir)/@PACKAGE@ -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \ + mv -f -b $(DESTDIR)$(kde_datadir)/@PACKAGE@/* $(DESTDIR)$(datadir)/@PACKAGE@/ ; \ + rmdir $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \ fi - if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \ - ln -s $(datadir)/@PACKAGE@ $(kde_datadir)/@PACKAGE@ ; \ -+ if [ "$(DESTDIR)$(kde_datadir)" -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \ ++ if [ -n "$(kde_datadir)" -a "$(DESTDIR)$(kde_datadir)" -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \ + ln -s $(datadir)/@PACKAGE@ $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \ fi diff -Nur ../celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am ./src/celestia/kde/data/Makefile.am --- ../celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am 2006-01-07 11:15:48.000000000 +0000 -+++ ./src/celestia/kde/data/Makefile.am 2007-02-03 12:49:04.000000000 +0000 ++++ ./src/celestia/kde/data/Makefile.am 2007-02-12 19:26:45.000000000 +0000 @@ -14,7 +14,7 @@ mimedir = $(kde_mimedir)/application mime_DATA = x-celestia-script.desktop diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-locale.patch b/sci-astronomy/celestia/files/celestia-1.4.1-locale.patch new file mode 100644 index 000000000000..f2340dd2ce72 --- /dev/null +++ b/sci-astronomy/celestia/files/celestia-1.4.1-locale.patch @@ -0,0 +1,203 @@ +--- po/Makefile.in.in 2005-07-19 21:18:52.000000000 +0100 ++++ po/Makefile.in.in.new 2007-02-12 17:51:55.000000000 +0000 +@@ -1,5 +1,5 @@ + # Makefile for PO directory in any package using GNU gettext. +-# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper ++# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU General Public +@@ -8,10 +8,11 @@ + # Please note that the actual code of GNU gettext is covered by the GNU + # General Public License and is *not* in the public domain. + # +-# Origin: gettext-0.14 ++# Origin: gettext-0.15 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + + SHELL = /bin/sh + @SET_MAKE@ +@@ -22,18 +23,28 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + localedir = $(datadir)/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) ++mkinstalldirs = $(SHELL) @install_sh@ -d ++mkdir_p = @mkdir_p@ + +-GMSGFMT = @GMSGFMT@ +-MSGFMT = @MSGFMT@ +-XGETTEXT = @XGETTEXT@ ++GMSGFMT_ = @GMSGFMT@ ++GMSGFMT_no = @GMSGFMT@ ++GMSGFMT_yes = @GMSGFMT_015@ ++GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) ++MSGFMT_ = @MSGFMT@ ++MSGFMT_no = @MSGFMT@ ++MSGFMT_yes = @MSGFMT_015@ ++MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) ++XGETTEXT_ = @XGETTEXT@ ++XGETTEXT_no = @XGETTEXT@ ++XGETTEXT_yes = @XGETTEXT_015@ ++XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) + MSGMERGE = msgmerge + MSGMERGE_UPDATE = @MSGMERGE@ --update + MSGINIT = msginit +@@ -46,7 +57,7 @@ + DUMMYPOFILES = @DUMMYPOFILES@ + DISTFILES.common = Makefile.in.in remove-potcdate.sin \ + $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \ ++DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ + $(POFILES) $(GMOFILES) \ + $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) + +@@ -79,6 +90,12 @@ + all-yes: stamp-po + all-no: + ++# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no ++# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because ++# we don't want to bother translators with empty POT files). We assume that ++# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. ++# In this case, stamp-po is a nop (i.e. a phony target). ++ + # stamp-po is a timestamp denoting the last time at which the CATALOGS have + # been loosely updated. Its purpose is that when a developer or translator + # checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +@@ -88,10 +105,13 @@ + # $(POFILES) has been designed to not touch files that don't need to be + # changed. + stamp-po: $(srcdir)/$(DOMAIN).pot +- test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) +- @echo "touch stamp-po" +- @echo timestamp > stamp-poT +- @mv stamp-poT stamp-po ++ test ! -f $(srcdir)/$(DOMAIN).pot || \ ++ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) ++ @test ! -f $(srcdir)/$(DOMAIN).pot || { \ ++ echo "touch stamp-po" && \ ++ echo timestamp > stamp-poT && \ ++ mv stamp-poT stamp-po; \ ++ } + + # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', + # otherwise packages like GCC can not be built if only parts of the source +@@ -100,11 +120,16 @@ + # This target rebuilds $(DOMAIN).pot; it is an expensive operation. + # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. + $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed ++ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ ++ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ ++ else \ ++ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ ++ fi; \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ +- --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' ++ --msgid-bugs-address="$$msgid_bugs_address" + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ +@@ -143,7 +168,7 @@ + install-exec: + install-data: install-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ ++ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ +@@ -156,13 +181,13 @@ + fi + install-data-no: all + install-data-yes: all +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkinstalldirs) $(DESTDIR)$$dir; \ ++ $(mkdir_p) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ +@@ -202,19 +227,19 @@ + installdirs-exec: + installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ ++ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi + installdirs-data-no: + installdirs-data-yes: +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkinstalldirs) $(DESTDIR)$$dir; \ ++ $(mkdir_p) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ +@@ -289,11 +314,14 @@ + $(MAKE) update-po + @$(MAKE) dist2 + # This is a separate target because 'update-po' must be executed before. +-dist2: $(DISTFILES) ++dist2: stamp-po $(DISTFILES) + dists="$(DISTFILES)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ ++ if test -f $(srcdir)/$(DOMAIN).pot; then \ ++ dists="$$dists $(DOMAIN).pot stamp-po"; \ ++ fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ +@@ -305,9 +333,9 @@ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ + for file in $$dists; do \ + if test -f $$file; then \ +- cp -p $$file $(distdir); \ ++ cp -p $$file $(distdir) || exit 1; \ + else \ +- cp -p $(srcdir)/$$file $(distdir); \ ++ cp -p $(srcdir)/$$file $(distdir) || exit 1; \ + fi; \ + done + +@@ -354,10 +382,9 @@ + update-gmo: Makefile $(GMOFILES) + @: + +-Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@ ++Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ + cd $(top_builddir) \ +- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ +- $(SHELL) ./config.status ++ && $(SHELL) ./config.status $(subdir)/$@.in po-directories + + force: + diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch b/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch index 7c02999116fe..e3933a0d6c7f 100644 --- a/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch +++ b/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch @@ -1,6 +1,6 @@ -diff -Nur celestia-1.4.1.orig/configure.in celestia-1.4.1/configure.in ---- celestia-1.4.1.orig/configure.in 2006-02-03 18:09:54.000000000 +0000 -+++ celestia-1.4.1/configure.in 2006-09-19 10:04:57.000000000 +0100 +diff -Nur ../celestia-1.4.1/configure.in ./configure.in +--- ../celestia-1.4.1/configure.in 2006-02-03 18:09:54.000000000 +0000 ++++ ./configure.in 2007-02-12 16:27:42.000000000 +0000 @@ -383,7 +383,7 @@ AC_MSG_CHECKING([whether to enable Celestia Extension Language]) if (test "$enable_lua" != "no"); then @@ -10,9 +10,9 @@ diff -Nur celestia-1.4.1.orig/configure.in celestia-1.4.1/configure.in if (test "$lua_includes" != "no"); then CXXFLAGS="$CXXFLAGS -I$lua_includes" -diff -Nur celestia-1.4.1.orig/src/celestia/celx.cpp celestia-1.4.1/src/celestia/celx.cpp ---- celestia-1.4.1.orig/src/celestia/celx.cpp 2006-01-07 00:01:51.000000000 +0000 -+++ celestia-1.4.1/src/celestia/celx.cpp 2006-09-19 10:05:06.000000000 +0100 +diff -Nur ../celestia-1.4.1/src/celestia/celx.cpp ./src/celestia/celx.cpp +--- ../celestia-1.4.1/src/celestia/celx.cpp 2006-01-07 00:01:51.000000000 +0000 ++++ ./src/celestia/celx.cpp 2007-02-12 16:27:42.000000000 +0000 @@ -32,9 +32,7 @@ #include "celx.h" diff --git a/sci-astronomy/celestia/files/digest-celestia-1.4.1-r1 b/sci-astronomy/celestia/files/digest-celestia-1.4.1-r2 similarity index 100% rename from sci-astronomy/celestia/files/digest-celestia-1.4.1-r1 rename to sci-astronomy/celestia/files/digest-celestia-1.4.1-r2