| 1 |
aballier 13/07/31 21:24:23 |
| 2 |
|
| 3 |
Modified: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild |
| 4 |
Log: |
| 5 |
Install java stuff from the proper place, bug #479300. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.64 media-libs/libjpeg-turbo/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.64&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.64&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.63&r2=1.64 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v |
| 19 |
retrieving revision 1.63 |
| 20 |
retrieving revision 1.64 |
| 21 |
diff -u -r1.63 -r1.64 |
| 22 |
--- ChangeLog 31 Jul 2013 16:07:28 -0000 1.63 |
| 23 |
+++ ChangeLog 31 Jul 2013 21:24:23 -0000 1.64 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for media-libs/libjpeg-turbo |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.63 2013/07/31 16:07:28 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.64 2013/07/31 21:24:23 aballier Exp $ |
| 29 |
+ |
| 30 |
+ 31 Jul 2013; Alexis Ballier <aballier@g.o> |
| 31 |
+ libjpeg-turbo-1.3.0-r1.ebuild: |
| 32 |
+ Install java stuff from the proper place, bug #479300. |
| 33 |
|
| 34 |
31 Jul 2013; Alexis Ballier <aballier@g.o> |
| 35 |
libjpeg-turbo-1.3.0-r1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.4 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.4&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.4&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?r1=1.3&r2=1.4 |
| 44 |
|
| 45 |
Index: libjpeg-turbo-1.3.0-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v |
| 48 |
retrieving revision 1.3 |
| 49 |
retrieving revision 1.4 |
| 50 |
diff -u -r1.3 -r1.4 |
| 51 |
--- libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 16:07:28 -0000 1.3 |
| 52 |
+++ libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 21:24:23 -0000 1.4 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2013 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI=5 |
| 60 |
|
| 61 |
@@ -99,6 +99,16 @@ |
| 62 |
docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 63 |
exampledir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 64 |
install |
| 65 |
+ |
| 66 |
+ if [[ ${ABI} == ${DEFAULT_ABI} ]] && use java; then |
| 67 |
+ insinto /usr/share/doc/${PF}/html/java |
| 68 |
+ doins -r "${S}/"java/doc/* |
| 69 |
+ newdoc "${S}/"java/README README.java |
| 70 |
+ |
| 71 |
+ rm -rf "${ED}"usr/classes |
| 72 |
+ java-pkg_dojar java/turbojpeg.jar |
| 73 |
+ fi |
| 74 |
+ |
| 75 |
} |
| 76 |
|
| 77 |
multilib_src_install_all() { |
| 78 |
@@ -107,15 +117,6 @@ |
| 79 |
insinto /usr/share/doc/${PF}/html |
| 80 |
doins -r doc/html/* |
| 81 |
|
| 82 |
- if use java; then |
| 83 |
- insinto /usr/share/doc/${PF}/html/java |
| 84 |
- doins -r java/doc/* |
| 85 |
- newdoc java/README README.java |
| 86 |
- |
| 87 |
- rm -rf "${ED}"usr/classes |
| 88 |
- java-pkg_dojar java/turbojpeg.jar |
| 89 |
- fi |
| 90 |
- |
| 91 |
ebegin "Installing exifautotran and jpegexiforient extra tools" |
| 92 |
pushd ../debian/extra >/dev/null |
| 93 |
newdoc ../changelog changelog.debian |
Archives