diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-17 00:54:15 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-17 00:54:15 +0000 |
commit | 3c1ce9356f13f21d645c692ca80499caf12e332c (patch) | |
tree | 9273feec68b7fb6ffa46ec475a938187818b1234 /app-text/djvu | |
parent | app-admin/smolt: Trivial-bump to 1.4.2 (diff) | |
download | gentoo-2-3c1ce9356f13f21d645c692ca80499caf12e332c.tar.gz gentoo-2-3c1ce9356f13f21d645c692ca80499caf12e332c.tar.bz2 gentoo-2-3c1ce9356f13f21d645c692ca80499caf12e332c.zip |
old
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'app-text/djvu')
-rw-r--r-- | app-text/djvu/Manifest | 3 | ||||
-rw-r--r-- | app-text/djvu/djvu-3.5.22.ebuild | 111 | ||||
-rw-r--r-- | app-text/djvu/files/djvu-3.5.21-parallel-build.patch | 78 | ||||
-rw-r--r-- | app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch | 54 |
4 files changed, 0 insertions, 246 deletions
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest index 81391eaeb950..e69e5d522d68 100644 --- a/app-text/djvu/Manifest +++ b/app-text/djvu/Manifest @@ -1,9 +1,6 @@ -AUX djvu-3.5.21-parallel-build.patch 2664 RMD160 82b42bc660a02f15f8f71e8ccb164fcc21221ebc SHA1 9b3632421fb3710f0e849530cec1fdfab5844a77 SHA256 074f9e76509976fbe72c1432c1794300501e3fee8e59d10143fb9c8dd13665fc -AUX djvulibre-3.5.17-pthread-flag.patch 2419 RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 SHA1 2c028fd4bff1316a9278bc9047f6595ea3fc1e64 SHA256 e5bd52eba105c7792866f13f5abccf07daca220dc68ac045a4abc431c329805f DIST djvulibre-20090103.tar.gz 3043215 RMD160 b639067ac8c1a2b9c7860fef9b75c093bd60a437 SHA1 56f37aac149320df11fa54e2236a68921f06ada3 SHA256 178e50202f086f52a44f6a3ba0e550e4c882d59e1961587e5e2ff62dc270e079 DIST djvulibre-3.5.22.tar.gz 3027985 RMD160 f74cec88c5fbda28976e64669d3e48833b4dfdcd SHA1 f869d4114052a7df7b8da2d334d124934f1293a6 SHA256 3d9242f98db8f5fc8ca239ccaa91e70c20451fe3b3fa8de6f133e0888f89f0be EBUILD djvu-3.5.21_p20090103.ebuild 2410 RMD160 01b8c3d2a7a13f91693b351e4372df970b42a3a1 SHA1 87b6027017b2c3f040b774ec7302c4a8fcc85ee0 SHA256 e46ed9fa61883e5d113fcd644bdf52d4bebb3cd480166822c682dad1d34eb4fe EBUILD djvu-3.5.22-r1.ebuild 2238 RMD160 52807ddb3ccb16dd25fec2cb9ffd87042d8367d2 SHA1 4a4f538831835316bb2081bc68b0763d2d705523 SHA256 d9309ec6ed5cfea9eab5def3cdb7195fb423b00d1b27340f1eeef063e08e4e55 -EBUILD djvu-3.5.22.ebuild 2964 RMD160 cc3c49d1a5698b5f21631868b913632fce7c5285 SHA1 d9000733fb0b2275975de442aee2b8e4be28e119 SHA256 2cb8071dae93e6b914fec48cce4a8438b0d561a39da8e2b45ea8319cd74402fe MISC ChangeLog 13373 RMD160 178d0aa43eae92a95f9b9448af778b8e71651cb1 SHA1 60ec88cbbef3abdcfe01e740bcd21f64d7d720de SHA256 2d8a94f5a1239ff4b2df7d0fcbe3cffe6f06f5bd403b67647201ef9b8b7e3c1e MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672 diff --git a/app-text/djvu/djvu-3.5.22.ebuild b/app-text/djvu/djvu-3.5.22.ebuild deleted file mode 100644 index 4e50de3669e6..000000000000 --- a/app-text/djvu/djvu-3.5.22.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.6 2010/01/25 13:32:04 ssuominen Exp $ - -EAPI=1 -inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils - -MY_P="${PN}libre-${PV#*_p}" - -DESCRIPTION="DjVu viewers, encoders and utilities" -HOMEPAGE="http://djvu.sourceforge.net" -SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="xml qt3 jpeg tiff debug nls nsplugin kde doc" - -RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2:0 ) - tiff? ( media-libs/tiff ) - qt3? ( x11-libs/qt:3 )" -DEPEND="${RDEPEND} - qt3? ( nsplugin? ( x11-libs/libXt ) )" - -S=${WORKDIR}/${MY_P} - -LANGS="cs de en fr ja zh" -for X in ${LANGS}; do - IUSE="${IUSE} linguas_${X}" -done - -pkg_setup() { - if ! use qt3; then - ewarn - ewarn "The standalone djvu viewer, djview, will not be compiled." - ewarn "Add \"qt3\" to your USE flags if you want it." - ewarn - fi - - confutils_use_depend_all nsplugin qt3 -} - -src_compile() { - local I18N - if use nls; then - for X in ${LANGS}; do - if use linguas_${X}; then - I18N="${I18N} ${X}" - fi - done - I18N="${I18N# }" - if test -n "$I18N"; then - I18N="--enable-i18n=${I18N}" - else - I18N="--enable-i18n" - fi - else - I18N="--disable-i18n" - fi - - # We install all desktop files by hand. - econf --disable-desktopfiles \ - $(use_with qt3 qt) \ - $(use_enable xml xmltools) \ - $(use_with jpeg) \ - $(use_with tiff) \ - "${I18N}" \ - $(use_enable debug) \ - ${QTCONF} - - if ! use nsplugin; then - sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die - fi - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install || die - - dodoc README TODO NEWS - - use doc && cp -r doc/ "${D}"/usr/share/doc/${PF} - - # Install desktop files. - cd desktopfiles - insinto /usr/share/icons/hicolor/22x22/mimetypes && newins hi22-djvu.png image-vnd.djvu.png || die - insinto /usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png || die - insinto /usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png || die - insinto /usr/share/mime/packages && doins djvulibre-mime.xml || die - if use kde ; then - insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop || die - cp "${D}"/usr/share/mimelnk/image/{vnd.djvu.desktop,x-djvu.desktop} - sed -i -e 's:image/vnd.djvu:image/x-djvu:' "${D}"/usr/share/mimelnk/image/x-djvu.desktop - fi - - if use qt3 ; then - insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png || die - insinto /usr/share/applications/ && doins djvulibre-djview3.desktop || die - fi -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/app-text/djvu/files/djvu-3.5.21-parallel-build.patch b/app-text/djvu/files/djvu-3.5.21-parallel-build.patch deleted file mode 100644 index 0d305058a558..000000000000 --- a/app-text/djvu/files/djvu-3.5.21-parallel-build.patch +++ /dev/null @@ -1,78 +0,0 @@ -Author: Peter Volkov <pva@gentoo.org> -Upstream: notified: https://sourceforge.net/tracker/?func=detail&atid=406585&aid=2110660&group_id=32953 -Reason: parallel build failes, bug #236418 - -=== modified file 'i18n/cs/Makefile.in' ---- i18n/cs/Makefile.in 2008-09-14 12:06:27 +0000 -+++ i18n/cs/Makefile.in 2008-09-14 12:11:48 +0000 -@@ -98,6 +98,6 @@ - - .ts.qm: - if test ${LRELEASE} = ":" ; then : ; else \ -- echo TRANSLATIONS=tmp.ts > tmp.pro && \ -- cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \ -- ${RM} tmp.qm tmp.ts tmp.pro ; fi -+ echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \ -+ cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \ -+ ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi - -=== modified file 'i18n/de/Makefile.in' ---- i18n/de/Makefile.in 2008-09-14 12:06:27 +0000 -+++ i18n/de/Makefile.in 2008-09-14 12:11:42 +0000 -@@ -65,7 +65,7 @@ - done - - # Install localized man pages --install-man: FORCE ${NSDEJAVU1} -+install-man: FORCE ${NSDEJAVU1} - test ${LANGCODE} != dummy - -${INSTALL} -d ${man} - -for n in ${MANFILES} ; do \ -@@ -98,6 +98,6 @@ - - .ts.qm: - if test ${LRELEASE} = ":" ; then : ; else \ -- echo TRANSLATIONS=tmp.ts > tmp.pro && \ -- cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \ -- ${RM} tmp.qm tmp.ts tmp.pro ; fi -+ echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \ -+ cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \ -+ ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi - -=== modified file 'i18n/fr/Makefile.in' ---- i18n/fr/Makefile.in 2008-09-14 12:06:27 +0000 -+++ i18n/fr/Makefile.in 2008-09-14 12:11:32 +0000 -@@ -98,6 +98,6 @@ - - .ts.qm: - if test ${LRELEASE} = ":" ; then : ; else \ -- echo TRANSLATIONS=tmp.ts > tmp.pro && \ -- cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \ -- ${RM} tmp.qm tmp.ts tmp.pro ; fi -+ echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \ -+ cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \ -+ ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi - -=== modified file 'i18n/ja/Makefile.in' ---- i18n/ja/Makefile.in 2008-09-14 12:06:27 +0000 -+++ i18n/ja/Makefile.in 2008-09-14 15:41:54 +0000 -@@ -46,7 +46,7 @@ - # (uncomment after translating nsdejavu.1.in) - NSDEJAVU1= nsdejavu.1 - --all: -+all: - @GUI_YES@all: ${QMFILES} ${NSDEJAVU1} - - @GUI_YES@install: install-qm -@@ -99,6 +99,6 @@ - - .ts.qm: - if test ${LRELEASE} = ":" ; then : ; else \ -- echo TRANSLATIONS=tmp.ts > tmp.pro && \ -- cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \ -- ${RM} tmp.qm tmp.ts tmp.pro ; fi -+ echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \ -+ cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \ -+ ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi - diff --git a/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch b/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch deleted file mode 100644 index 58dfd8f764d4..000000000000 --- a/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- config/acinclude.m4.orig 2006-05-08 15:05:41.000000000 +0200 -+++ config/acinclude.m4 2006-05-08 15:22:15.000000000 +0200 -@@ -332,7 +332,9 @@ - fi - # Create a list of thread flags to try. Items starting with a "-" are - # C compiler flags, and other items are library names, except for "none" --# which indicates that we try without any flags at all. -+# which indicates that we try without any flags at all. Also, combinations -+# of items (for instance, both a compiler flag and a library name) can be -+# specified using a colon separator. - acx_pthread_flags="pthreads none -Kthread -kthread lthread - -pthread -pthreads -mthreads pthread - --thread-safe -mt" -@@ -364,12 +366,40 @@ - acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" - ;; - esac -+case "${host_os}-${GCC}" in -+ *linux*-yes) -+ # On Linux/GCC, libtool uses -nostdlib for linking, which cancel part -+ # of the -pthread flag effect (libpthread is not automatically linked). -+ # So we'll try to link with both -pthread and -lpthread first: -+ acx_pthread_flags="-pthread:pthread $acx_pthread_flags" -+ ;; -+esac - if test x"$acx_pthread_ok" = xno; then - for flag in $acx_pthread_flags; do - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; -+ *:*) -+ PTHREAD_CFLAGS="" -+ PTHREAD_LIBS="" -+ message="whether pthreads work with" -+ while test x"$flag" != x; do -+ subflag=`echo $flag | cut -d: -f1` -+ case $subflag in -+ -*) -+ PTHREAD_CFLAGS="$PTHREAD_CFLAGS $subflag" -+ message="$message $subflag" -+ ;; -+ *) -+ PTHREAD_LIBS="$PTHREAD_LIBS -l$subflag" -+ message="$message -l$subflag" -+ ;; -+ esac -+ flag=`echo $flag | cut -s -d: -f2-` -+ done -+ AC_MSG_CHECKING([$message]) -+ ;; - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" |