diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-09-29 09:33:55 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-09-29 09:33:55 +0000 |
commit | 66cb60d55ae68adfc58e74b0747e706e4e35d434 (patch) | |
tree | 2d509344f30b7443c1c905c66b59c24692db4c04 /app-text/wv2 | |
parent | x11-libs/libXcursor: drop old ebuilds (diff) | |
download | historical-66cb60d55ae68adfc58e74b0747e706e4e35d434.tar.gz historical-66cb60d55ae68adfc58e74b0747e706e4e35d434.tar.bz2 historical-66cb60d55ae68adfc58e74b0747e706e4e35d434.zip |
Version bump.
Package-Manager: portage-2.2_rc38/cvs/Linux i686
Diffstat (limited to 'app-text/wv2')
-rw-r--r-- | app-text/wv2/ChangeLog | 8 | ||||
-rw-r--r-- | app-text/wv2/Manifest | 17 | ||||
-rw-r--r-- | app-text/wv2/files/0.4.0-cmake.patch | 54 | ||||
-rw-r--r-- | app-text/wv2/wv2-0.4.0.ebuild (renamed from app-text/wv2/wv2-0.3.0.ebuild) | 24 |
4 files changed, 94 insertions, 9 deletions
diff --git a/app-text/wv2/ChangeLog b/app-text/wv2/ChangeLog index cdca5cb45309..91f456795607 100644 --- a/app-text/wv2/ChangeLog +++ b/app-text/wv2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/wv2 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.54 2009/06/15 01:18:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.55 2009/09/29 09:33:55 scarabeus Exp $ + +*wv2-0.4.0 (29 Sep 2009) + + 29 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +files/0.4.0-cmake.patch, -wv2-0.3.0.ebuild, +wv2-0.4.0.ebuild: + Version bump. 15 Jun 2009; Jeroen Roovers <jer@gentoo.org> wv2-0.3.1.ebuild: Stable for HPPA (bug #271967). diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest index 30452788e41e..9fb9b003d78e 100644 --- a/app-text/wv2/Manifest +++ b/app-text/wv2/Manifest @@ -1,10 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 0.4.0-cmake.patch 2144 RMD160 ba2ea8dd28ef694bf3e7657e90fceec73e48a648 SHA1 af282981bb528869f5ff099a4924fd83a329b3a5 SHA256 acc5ee2ed35a06ddcdac56d2ae3ea7c27ecb048399b4dd338bb657d21ec68f4a AUX wv2-0.2.3-gcc43.patch 431 RMD160 409fcdf68a2c71c415f70c4fa1d006368e01c9a0 SHA1 3ec74d1c118c516b5c2c3320c12268646e39a02c SHA256 d159e8b62d03b6196551f050cbfebae023fbe7804071dd0a2cb6a54ab3898793 AUX wv2-0.2.3-respectflags.patch 353 RMD160 cc706bf3cb533d9a11f647cb4d282d3bc6ef3727 SHA1 557aab31e363f8b6f11bd42567b94671f5624fc4 SHA256 342498eceb4f653a943d8fd44fa6553fb83c3105850fbcf2f698efdb1b0946dc DIST wv2-0.2.3.tar.bz2 908983 RMD160 0534ddb23ec5a6e222cbbc76e695f8ea5cf532c7 SHA1 8378f43806bc2614ccea2b265159ce0548192601 SHA256 8f2cf24a5eddb6711d7ba49c05c7b5dddc08ce0af564aba098f516c7cbb8b560 -DIST wv2-0.3.0.tar.bz2 952679 RMD160 53edc93fefbeb47cc74497178f0af066d2a716ed SHA1 369ef0ecee5242d1c4c724b2ae41f61f59191a9d SHA256 05bdb873f78ea2445d715e303c1d820c09e38fdaba4ae4754df9f303814d1ef4 DIST wv2-0.3.1.tar.bz2 1094203 RMD160 9e64fb57178daca5e917201e591845227ea75de9 SHA1 97349769b01fa4506cc608d80ca3a749a5203d64 SHA256 896ff8ec59e280e8cb1ef9a953b364845dd65de1cdf8e4ed8a7e045a3f81c546 +DIST wv2-0.4.0.tar.bz2 452586 RMD160 e38c3dda8ae41e68132b23d02b2a1f1c99570940 SHA1 610f807b5010645f1dab7b7602d761b3f4241bcb SHA256 0c6595e16cf9c5ec33ba0d653d3a980ac9df96f12f416645e01119bb299525d1 EBUILD wv2-0.2.3.ebuild 891 RMD160 1c77a4e224ef2ed535a16bfe321d71b17a1d8efd SHA1 4a87f166dfee0d419a018457cbdcb2f4b4afe017 SHA256 9c76873dc07e5087a6f56cecac50c58684b8abd9a01a6aee9fd005a174b99954 -EBUILD wv2-0.3.0.ebuild 761 RMD160 9e0bb060673be3787900cf55e34f75d72ecdd055 SHA1 8d33254526e4822d6ae6d0904a7f6ba714dc5fca SHA256 8f61027b81839dbafe52869b1efbc7acfc1d57072a4a7c3fced7a44947d8dbf8 EBUILD wv2-0.3.1.ebuild 748 RMD160 69ccee0f123250b79c658927df9c615266c68a4d SHA1 36a41777375c0928938eb1506b878e6a19521f64 SHA256 e2da122ca1e49985286521f6748a4283dbbbd1afbb871715a0a0ccab2382dfaa -MISC ChangeLog 6288 RMD160 1448a19e8c566c8478c34cd7664a22b88360ae51 SHA1 9804c7b7ed953104cdc438e67b0207b135e848ec SHA256 8e533baa92599c68c8494875385ec26263fe6ce26624a539a80ba8c6eda91eb3 +EBUILD wv2-0.4.0.ebuild 935 RMD160 b50ec43307ff1c76884b946ec2b91b0844484b53 SHA1 cc073cdfcb7104ff940ff5e4ac38d6e037da96d9 SHA256 2e107e10056c82245728347f117bbf810bcb66dda621e46f9e165ed1ccc2ea38 +MISC ChangeLog 6458 RMD160 dd4d466c28c42a104fa3ac9fa1650f8606f4e219 SHA1 c404fb80683c17fed3ee62e31e016e07a27239c3 SHA256 920e72a424604b31514799eeb81c591ddf556409b3a5b8ab7778e10a4a8c195a MISC metadata.xml 157 RMD160 e666a9e73ee48e70d6fc6ea78049d38b1fcde7c2 SHA1 43a0c32101f0c6ffd8fa1aa620c8032d194a9e3a SHA256 18238fb417d8677a0495cdaba9b043526174ba63b51494b88b10aa7dd903124c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkrB1I8ACgkQHB6c3gNBRYcwbgCgs5Rp85et1SkvMYiiB17AHxl/ +DasAoKXk4gYMv338JS9y/Q+YDrY6CD8k +=KM6h +-----END PGP SIGNATURE----- diff --git a/app-text/wv2/files/0.4.0-cmake.patch b/app-text/wv2/files/0.4.0-cmake.patch new file mode 100644 index 000000000000..0f5828da765b --- /dev/null +++ b/app-text/wv2/files/0.4.0-cmake.patch @@ -0,0 +1,54 @@ +diff -urN wv2-0.4.0.old/CMakeLists.txt wv2-0.4.0/CMakeLists.txt +--- wv2-0.4.0.old/CMakeLists.txt 2009-08-26 23:46:40.000000000 +0200 ++++ wv2-0.4.0/CMakeLists.txt 2009-09-29 11:21:50.000000000 +0200 +@@ -29,10 +29,10 @@ + SET( ICONV_REQUIRES_CONST ${ICONV_SECOND_ARGUMENT_IS_CONST} ) + ENDIF( ICONV_FOUND ) + +-OPTION( WITHOUT_ZLIB "Build wv2 without zlib (without compression features)" OFF ) +-IF( NOT WITHOUT_ZLIB ) ++OPTION( WITH_ZLIB "Build wv2 with zlib (with compression features)" ON ) ++IF( WITH_ZLIB ) + FIND_PACKAGE( ZLIB REQUIRED ) +-ENDIF( NOT WITHOUT_ZLIB ) ++ENDIF( WITH_ZLIB ) + + INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) + +@@ -129,9 +129,9 @@ + TRY_RUN( MODERN_ZLIB_RUN MODERN_ZLIB_COMPILE ${wvWare_BINARY_DIR}/CMakeTmp ${wvWare_SOURCE_DIR}/cmake/TestModernZlib.c ) + ENDIF( ZLIB_HAS_INFLATE ) + +-IF( MODERN_ZLIB_RUN GREATER 0 AND NOT WITHOUT_ZLIB ) ++IF( MODERN_ZLIB_RUN GREATER 0 AND WITH_ZLIB ) + MESSAGE( FATAL_ERROR "Your version of zlib is too old for wv2" ) +-ENDIF( MODERN_ZLIB_RUN GREATER 0 AND NOT WITHOUT_ZLIB ) ++ENDIF( MODERN_ZLIB_RUN GREATER 0 AND WITH_ZLIB ) + + # + # Set cflags and ldflags +diff -urN wv2-0.4.0.old/src/CMakeLists.txt wv2-0.4.0/src/CMakeLists.txt +--- wv2-0.4.0.old/src/CMakeLists.txt 2009-08-26 23:46:40.000000000 +0200 ++++ wv2-0.4.0/src/CMakeLists.txt 2009-09-29 11:20:05.000000000 +0200 +@@ -90,11 +90,11 @@ + INSTALL( TARGETS wv2 + EXPORT wvWare + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib/static ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}/static + ) + +-INSTALL( EXPORT wvWare DESTINATION lib/wvWare FILE wv2.cmake ) ++INSTALL( EXPORT wvWare DESTINATION lib${LIB_SUFFIX}/wvWare FILE wv2.cmake ) + + INSTALL( FILES ${wv2_HEADERS} + DESTINATION include/wv2 +@@ -103,5 +103,5 @@ + # libtool files are useless for Visual C++ and Borland C++ + IF( NOT MSVC AND NOT BORLAND ) + INCLUDE( ${wvWare_SOURCE_DIR}/cmake/MacroCreateLibtoolFile.cmake ) +- CREATE_LIBTOOL_FILE( wv2 /lib ) ++ CREATE_LIBTOOL_FILE( wv2 /lib${LIB_SUFFIX} ) + ENDIF( NOT MSVC AND NOT BORLAND ) diff --git a/app-text/wv2/wv2-0.3.0.ebuild b/app-text/wv2/wv2-0.4.0.ebuild index 7e1967d53627..4035e2348723 100644 --- a/app-text/wv2/wv2-0.3.0.ebuild +++ b/app-text/wv2/wv2-0.4.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.3.0.ebuild,v 1.1 2009/02/19 11:30:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.4.0.ebuild,v 1.1 2009/09/29 09:33:55 scarabeus Exp $ EAPI=1 -inherit eutils +inherit cmake-utils DESCRIPTION="Excellent MS Word filter lib, used in most Office suites" HOMEPAGE="http://wvware.sourceforge.net" @@ -13,15 +13,29 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" +IUSE="zlib" RDEPEND=">=gnome-extra/libgsf-1.8 media-libs/freetype:2 media-libs/libpng - media-gfx/imagemagick" + media-gfx/imagemagick + virtual/libiconv + zlib? ( sys-libs/zlib ) +" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PV}-cmake.patch +) + +src_configure() { + mycmakeargs="${mycmakeargs} + $(cmake-utils_use_with zlib) + " + cmake-utils_src_configure +} + src_install() { - emake DESTDIR="${D}" install || die "emake install failed." + cmake-utils_src_install dodoc AUTHORS ChangeLog README RELEASE THANKS TODO } |