diff options
-rw-r--r-- | app-text/djvu/ChangeLog | 7 | ||||
-rw-r--r-- | app-text/djvu/Manifest | 12 | ||||
-rw-r--r-- | app-text/djvu/djvu-3.5.19.ebuild | 112 | ||||
-rw-r--r-- | app-text/djvu/djvu-3.5.20-r1.ebuild | 132 | ||||
-rw-r--r-- | app-text/djvu/djvu-3.5.21.ebuild | 127 | ||||
-rw-r--r-- | app-text/djvu/djvu-3.5.21_p20090103.ebuild | 4 | ||||
-rw-r--r-- | app-text/djvu/djvu-3.5.22.ebuild | 4 |
7 files changed, 13 insertions, 385 deletions
diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog index c0be9c1b5979..56565df8582b 100644 --- a/app-text/djvu/ChangeLog +++ b/app-text/djvu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/djvu # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.96 2009/10/09 18:24:00 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.97 2009/10/28 09:50:48 pva Exp $ + + 28 Oct 2009; Peter Volkov <pva@gentoo.org> -djvu-3.5.19.ebuild, + -djvu-3.5.20-r1.ebuild, -djvu-3.5.21.ebuild, djvu-3.5.21_p20090103.ebuild, + djvu-3.5.22.ebuild: + Added die after make, thank tove. Drop old. *djvu-3.5.22 (09 Oct 2009) diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest index 8f4680d0b15d..039f4c077bde 100644 --- a/app-text/djvu/Manifest +++ b/app-text/djvu/Manifest @@ -1,14 +1,8 @@ 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.19.tar.gz 2380092 RMD160 2eb9b5df021bb7121a051d3256999da27dd3b682 SHA1 439977e03c8c35ca74eb5887993edb317923133f SHA256 57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78 -DIST djvulibre-3.5.20.tar.gz 2416958 RMD160 fb755064912586585656b9701b7d98bd3019c67b SHA1 88ec94512f3f7845b42c2585f75e07a9cf147380 SHA256 d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3 -DIST djvulibre-3.5.21.tar.gz 2993718 RMD160 2163b784d705cc7b55bb3d9c9eb85edec44f28a7 SHA1 a6ef5cb1445baa333883754c703abd75cc5b34f6 SHA256 39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4 DIST djvulibre-3.5.22.tar.gz 3027985 RMD160 f74cec88c5fbda28976e64669d3e48833b4dfdcd SHA1 f869d4114052a7df7b8da2d334d124934f1293a6 SHA256 3d9242f98db8f5fc8ca239ccaa91e70c20451fe3b3fa8de6f133e0888f89f0be -EBUILD djvu-3.5.19.ebuild 3295 RMD160 85ad554d5a7c8dd8990f8f8408c3b3953eba8704 SHA1 965f1fc093303026bba9eaf4829e1438ed84f898 SHA256 8c50ba5e182e3ecd34ec9a002159c8365f1a9e4c4b9af3be3ffd58734f60f9ce -EBUILD djvu-3.5.20-r1.ebuild 3524 RMD160 f9d14a06cdb2f57eeb4f41ff1ca3de87656551f1 SHA1 b9cdaec5cb6decb40a2d0aa49f639e71bc0dfef2 SHA256 b9ea8ac19f23d61e8db831eff08af6bae3b1c33f83880ce397ef0d9c8de8bc04 -EBUILD djvu-3.5.21.ebuild 3327 RMD160 98f91477ad1eb10d1ddb434726eef015c21bac8a SHA1 895d1553ebb388e32f5b08dfcf4c15eab7afdc8f SHA256 80a93fd443611de1a5f8da5cb7989cc94007a44f60e9d6d59b54441f02de5c1e -EBUILD djvu-3.5.21_p20090103.ebuild 2952 RMD160 b3f48c6d090c198945d50fae2af576127b832b98 SHA1 869749abe0e98c2741df52a4c8196fcc7bd74fcf SHA256 c047add9198ff2fd6d1643ec0c3fea216ecb5dee2ca3778d5ae819c916aa8f18 -EBUILD djvu-3.5.22.ebuild 2954 RMD160 3e83b7054e72156fe50a6e6f40e690f93430fdf4 SHA1 54726e7291a1e6437181924a431130317577f75a SHA256 ee9152617d6c17576fd31db16df3da4b978147f79d8e5a226f8912e5ece35d13 -MISC ChangeLog 12470 RMD160 55ae4b48dfe928c998f23a0b18083b40db9d4d21 SHA1 3809e18f7186870e82e270ee4b86041450bccac0 SHA256 5b8410928542787bcbfdfab78bb17b39ad7f05c528433f7b183c50f1e90055a7 +EBUILD djvu-3.5.21_p20090103.ebuild 2956 RMD160 305deedfef798f6d17614b5195285dfd7019b2ed SHA1 e92b7534030b2db6eb805dfa42ea8f818884fc9e SHA256 e55fac86ed2b650acad774809d28346014240c685ba0c8b8f153a3aa3d0ff7a6 +EBUILD djvu-3.5.22.ebuild 2957 RMD160 080772b1f0a65f4709fccd232648b1d1421d7f95 SHA1 c99253cc83fd638c9feff3420c5cec436cdba5d7 SHA256 a8aa836c80c22fba63ad2de5384c122f8aa13aa2dae86abc77715a48baf1ad32 +MISC ChangeLog 12678 RMD160 4ca68e8ac3c672adfa9873e5042be7ab3abcf7d2 SHA1 6ca5f934182b1cba4be38b3c14e9755d20ca6b72 SHA256 9e7b985bea5bba7cf7fd2f47bc9cfa802eb565154891005c8c1136d1daa45c57 MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672 diff --git a/app-text/djvu/djvu-3.5.19.ebuild b/app-text/djvu/djvu-3.5.19.ebuild deleted file mode 100644 index 8e77a7900934..000000000000 --- a/app-text/djvu/djvu-3.5.19.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.19.ebuild,v 1.9 2007/06/27 06:03:59 corsair Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" -inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs autotools - -MY_P="${PN}libre-${PV}" - -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 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde doc" - -DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( media-libs/tiff ) - qt3? ( <x11-libs/qt-4 )" - -S="${WORKDIR}/${MY_P}" - -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 -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Do not strip binaries as portage does this for us. bug #135208 - sed -i 's:${INSTALL_PROGRAM} -s:${INSTALL_PROGRAM}:' \ - gui/djview/Makefile.in tools/Makefile.in xmltools/Makefile.in - - # Fix compilaton with --as-needed. bug #132473 - epatch "${FILESDIR}"/djvulibre-3.5.17-pthread-flag.patch - - AT_M4DIR="config" eautoreconf -} - -src_compile() { - # assembler problems and hence non-building with pentium4 - # <obz@gentoo.org> - replace-flags -march=pentium4 -march=pentium3 - echo LINGUAS=$LINGUAS - - # When enabling qt it must be compiled with threads. See bug #89544. - if use qt3 ; then - QTCONF=" --with-qt --enable-threads " - elif use threads ; then - QTCONF=" --without-qt --disable-djview --enable-threads " - else - QTCONF=" --without-qt --disable-djview --disable-threads " - fi - - # We install all desktop files by hand. - econf --disable-desktopfiles \ - $(use_enable xml xmltools) \ - $(use_with jpeg) \ - $(use_with tiff) \ - $(use_enable nls i18n) \ - $(use_enable debug) \ - ${QTCONF} \ - || die "econf failed" - - if ! use nsplugin; then - sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die - fi - - emake -j1 || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install - - 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 - insinto /usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png - insinto /usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png - insinto /usr/share/mime/packages && doins djvulibre-mime.xml - if use kde ; then - insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop x-djvu.desktop - 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 - - insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png - insinto /usr/share/applications/ && doins djvulibre-djview3.desktop -} - -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/djvu-3.5.20-r1.ebuild b/app-text/djvu/djvu-3.5.20-r1.ebuild deleted file mode 100644 index eb07c0f1838e..000000000000 --- a/app-text/djvu/djvu-3.5.20-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.20-r1.ebuild,v 1.9 2008/10/27 05:50:09 vapier Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" -inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs autotools confutils - -MY_P="${PN}libre-${PV}" - -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 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde doc" - -DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( media-libs/tiff ) - qt3? ( =x11-libs/qt-3* )" - -S=${WORKDIR}/${MY_P} - -LANGS="cs de fr ja" -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_unpack() { - unpack ${A} - cd "${S}" - - # Do not strip binaries as portage does this for us. bug #135208 - find -name Makefile.in -exec sed -i 's:${INSTALL_PROGRAM} -s:${INSTALL_PROGRAM}:' \{\} \; - eautomake -} - -src_compile() { - # assembler problems and hence non-building with pentium4 - # <obz@gentoo.org> - replace-flags -march=pentium4 -march=pentium3 - - 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 - - # When enabling qt it must be compiled with threads. See bug #89544. - if use qt3 ; then - QTCONF=" --with-qt --enable-threads " - elif use threads ; then - QTCONF=" --without-qt --disable-djview --enable-threads " - else - QTCONF=" --without-qt --disable-djview --disable-threads " - fi - - # We install all desktop files by hand. - econf --disable-desktopfiles \ - $(use_enable xml xmltools) \ - $(use_with jpeg) \ - $(use_with tiff) \ - "${I18N}" \ - $(use_enable debug) \ - ${QTCONF} \ - || die "econf failed" - - if ! use nsplugin; then - sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die - fi - - emake -j1 || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install - - 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 - insinto /usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png - insinto /usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png - insinto /usr/share/mime/packages && doins djvulibre-mime.xml - if use kde ; then - insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop x-djvu.desktop - 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 - insinto /usr/share/applications/ && doins djvulibre-djview3.desktop - 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/djvu-3.5.21.ebuild b/app-text/djvu/djvu-3.5.21.ebuild deleted file mode 100644 index 388287b1d011..000000000000 --- a/app-text/djvu/djvu-3.5.21.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21.ebuild,v 1.11 2008/12/01 21:23:48 ranger Exp $ - -EAPI=1 -inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils - -MY_P="${PN}libre-${PV}" - -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 threads nls nsplugin kde doc" - -RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 ) - 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_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-parallel-build.patch -} - -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 - - # When enabling qt it must be compiled with threads. See bug #89544. - if use qt3 ; then - QTCONF=" --with-qt --enable-threads " - elif use threads ; then - QTCONF=" --without-qt --disable-djview --enable-threads " - else - QTCONF=" --without-qt --disable-djview --disable-threads " - fi - - # We install all desktop files by hand. - econf --disable-desktopfiles \ - $(use_enable xml xmltools) \ - $(use_with jpeg) \ - $(use_with tiff) \ - "${I18N}" \ - $(use_enable debug) \ - ${QTCONF} \ - || die "econf failed" - - 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 - - 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/djvu-3.5.21_p20090103.ebuild b/app-text/djvu/djvu-3.5.21_p20090103.ebuild index a41db23f1d3c..83372ee5915a 100644 --- a/app-text/djvu/djvu-3.5.21_p20090103.ebuild +++ b/app-text/djvu/djvu-3.5.21_p20090103.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21_p20090103.ebuild,v 1.8 2009/04/15 16:53:46 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21_p20090103.ebuild,v 1.9 2009/10/28 09:50:48 pva Exp $ EAPI=1 inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils @@ -76,7 +76,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install + emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install || die dodoc README TODO NEWS diff --git a/app-text/djvu/djvu-3.5.22.ebuild b/app-text/djvu/djvu-3.5.22.ebuild index fa064e431e61..a6215e2e5fc5 100644 --- a/app-text/djvu/djvu-3.5.22.ebuild +++ b/app-text/djvu/djvu-3.5.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.1 2009/10/09 18:24:00 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.2 2009/10/28 09:50:48 pva Exp $ EAPI=1 inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils @@ -76,7 +76,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install + emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install || die dodoc README TODO NEWS |