diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-31 21:24:23 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-31 21:24:23 +0000 |
| commit | db9faeef6c409d7fab2010af9e588fe31b7634b4 (patch) | |
| tree | 2808e5a40d17855efe073588087ee8ab89b5e9cc /media-libs/libjpeg-turbo | |
| parent | Update HOMEPAGE wrt bug #479224. (diff) | |
| download | gentoo-2-db9faeef6c409d7fab2010af9e588fe31b7634b4.tar.gz gentoo-2-db9faeef6c409d7fab2010af9e588fe31b7634b4.tar.bz2 gentoo-2-db9faeef6c409d7fab2010af9e588fe31b7634b4.zip | |
Install java stuff from the proper place, bug #479300.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs/libjpeg-turbo')
| -rw-r--r-- | media-libs/libjpeg-turbo/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild | 21 |
2 files changed, 16 insertions, 11 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog index f115859bd6a1..c18b0999c31c 100644 --- a/media-libs/libjpeg-turbo/ChangeLog +++ b/media-libs/libjpeg-turbo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libjpeg-turbo # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.63 2013/07/31 16:07:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.64 2013/07/31 21:24:23 aballier Exp $ + + 31 Jul 2013; Alexis Ballier <aballier@gentoo.org> + libjpeg-turbo-1.3.0-r1.ebuild: + Install java stuff from the proper place, bug #479300. 31 Jul 2013; Alexis Ballier <aballier@gentoo.org> libjpeg-turbo-1.3.0-r1.ebuild: diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild index e8a16049dcf1..ba9c16a5fb27 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.3 2013/07/31 16:07:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.4 2013/07/31 21:24:23 aballier Exp $ EAPI=5 @@ -99,6 +99,16 @@ multilib_src_install() { docdir="${EPREFIX}"/usr/share/doc/${PF} \ exampledir="${EPREFIX}"/usr/share/doc/${PF} \ install + + if [[ ${ABI} == ${DEFAULT_ABI} ]] && use java; then + insinto /usr/share/doc/${PF}/html/java + doins -r "${S}/"java/doc/* + newdoc "${S}/"java/README README.java + + rm -rf "${ED}"usr/classes + java-pkg_dojar java/turbojpeg.jar + fi + } multilib_src_install_all() { @@ -107,15 +117,6 @@ multilib_src_install_all() { insinto /usr/share/doc/${PF}/html doins -r doc/html/* - if use java; then - insinto /usr/share/doc/${PF}/html/java - doins -r java/doc/* - newdoc java/README README.java - - rm -rf "${ED}"usr/classes - java-pkg_dojar java/turbojpeg.jar - fi - ebegin "Installing exifautotran and jpegexiforient extra tools" pushd ../debian/extra >/dev/null newdoc ../changelog changelog.debian |