From b29e540c4050c5d337527a7d41249b29f33cb253 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 13 Feb 2012 19:31:18 +0000 Subject: Fix docdir Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64 --- media-libs/libjpeg-turbo/ChangeLog | 13 ++- media-libs/libjpeg-turbo/Manifest | 18 ++-- .../libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild | 112 +++++++++++++++++++++ .../libjpeg-turbo/libjpeg-turbo-1.2.0.ebuild | 108 -------------------- 4 files changed, 133 insertions(+), 118 deletions(-) create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild delete mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0.ebuild (limited to 'media-libs/libjpeg-turbo') diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog index 4c636fdde1aa..57218006cbab 100644 --- a/media-libs/libjpeg-turbo/ChangeLog +++ b/media-libs/libjpeg-turbo/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for media-libs/libjpeg-turbo # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.30 2012/02/11 19:11:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.31 2012/02/13 19:31:18 ssuominen Exp $ + + 13 Feb 2012; Samuli Suominen + -libjpeg-turbo-1.2.0.ebuild: + old + +*libjpeg-turbo-1.2.0-r1 (13 Feb 2012) + + 13 Feb 2012; Samuli Suominen + +libjpeg-turbo-1.2.0-r1.ebuild: + Move documentation installed from upstream Makefile.am to correct directory + wrt #403447 11 Feb 2012; Samuli Suominen -libjpeg-turbo-1.1.90_p20120210.ebuild: diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index 394fe2f87094..05824822b116 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -6,17 +6,17 @@ DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e1 DIST libjpeg8_8c-1.debian.tar.gz 13756 RMD160 7ceb995b47678bc841e217deaa32f05d70f8d80e SHA1 0c95ebe091e3d535d9d6d8c128ec8bd07e0542fb SHA256 2d45eb7302d2c9a5b6cf12784629ec1bdbbb271a10d600532e5fbde3c19ea765 DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 EBUILD libjpeg-turbo-1.1.1.ebuild 1394 RMD160 2d1502066ad8d7a2664d441a64aca14f5469a6e4 SHA1 b244af8e60eb9ec84cf14baf9102740f7f6d05e9 SHA256 9f58313d95cb4ce6eb83400519186c0cfb89854d9b32eb62a38023a165efb401 -EBUILD libjpeg-turbo-1.2.0.ebuild 2597 RMD160 9e3c9dfa8f226289ecbfa5e1989bfccc2e372ed7 SHA1 eed23ea6311228c213fe429d9f787c8f498f7bb1 SHA256 f260832defc974ff2f75ae4cfcd9d373f46f0b3ef92b245559680f4a43fd0132 -MISC ChangeLog 4729 RMD160 00baefd9ae7626b1144507162dfb7ba36ca9d3f3 SHA1 a3f6805415ef1e155c3e12b733a71a6a04398976 SHA256 34af4f4370e95aac743353dba4c3009a1945c8563b4c758b430cc9c99f0f2ff1 +EBUILD libjpeg-turbo-1.2.0-r1.ebuild 2675 RMD160 92d67bddddaa16957a859b830e4bf32fadd99c5c SHA1 5b7ce2a5acfade993d827285c0ea51fd5ea5a9e6 SHA256 9dd7dc9d4d8dff7bb845ecf788c02add0ceb9b51432984a030deb7a968ab245f +MISC ChangeLog 5041 RMD160 7d0ef7b3e0391ffb81bc3a062fb7743281f4de3d SHA1 1b5767fd2dd8bd2628502b1f339e1d268a29c261 SHA256 b0fec1c9ca37a0dee776520b1d8e055a12d5c136cddba6e6134654a0a5024c00 MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPNryFAAoJEEdUh39IaPFNthkH/AvDZsHr9+RDezaFbkkzo4+m -+BfDg1/4pqgu+X3Lmplh9Y77vgsbTyhUpN26y+sflRljGn72hi7/Un3f4wMbOzHk -wQeeIvbzRRd1FKZpcMtk0qA//IUGAXi56/uH4qCgWa85rfigg0Y7tHinfqpFHSOi -UKy05IMDtCNKPx65FNAx9Ls/1m+IDf6SRMsl6ugcTVPOdpmaEw4ntekCiW2fRmcd -BGuJi5vFUAtZ85SVu1LZv2fwgtFBt+RSoDE2U7ucOCgCBQKMZyMsphrFElcK8GPk -SldNA3nOoQWu0urNnQ7uB/5cLS1hOVtpd8o3CfBxaEmkQIYqbWnAJX3te8lp8UM= -=R/N3 +iQEcBAEBAgAGBQJPOWRZAAoJEEdUh39IaPFNj9cH/36TN2ck+5Th7JXtJvczD2Oz ++66Sd/HPb+W2eqi5d2GfTgl5dVjn5alu2n7pQPBfrlb+fZgNOwmKvmI70ubyOg2T +dC2+1wAAIddgEu+vdsyi4+i6Kprs0GtrKq3ZtLOubxMjG9QSt3eU25znX5qPclm7 +/eHxJMnLDgEPJ0WmfbTXghDpNO1C0rpo2dv7Tw+iwHdlFUIF+SI7gMF/zRC2CX4z +TclSRm72zBY4iFqyk727E6tjoGfSn5iF/IptRg7HLqq8ZRt3pMgKvnoAur4ihkkh +tVIR8nxU0TzDQwajZsdxmAT0aWxuRHgOuNVWWG1K+RdrPH7uuspH7hzgetutazA= +=b5mu -----END PGP SIGNATURE----- diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild new file mode 100644 index 000000000000..8d525860435b --- /dev/null +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2012 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.2.0-r1.ebuild,v 1.1 2012/02/13 19:31:18 ssuominen Exp $ + +# http://libjpeg-turbo.svn.sourceforge.net/viewvc/libjpeg-turbo/branches/1.2.x/?view=tar + +EAPI=4 + +unset _inherits + +JPEG_ABI=8 + +if [[ ${PV} == *_p20* ]]; then + SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz" + _inherits=autotools +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +fi + +inherit ${_inherits} java-pkg-opt-2 libtool toolchain-funcs + +DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" +HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/" +SRC_URI="${SRC_URI} + mirror://debian/pool/main/libj/libjpeg${JPEG_ABI}/libjpeg${JPEG_ABI}_${JPEG_ABI}d-1.debian.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="java static-libs" + +ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" +COMMON_DEPEND="!media-libs/jpeg:0" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.5 )" +DEPEND="${COMMON_DEPEND} + amd64? ( ${ASM_DEPEND} ) + x86? ( ${ASM_DEPEND} ) + amd64-linux? ( ${ASM_DEPEND} ) + x86-linux? ( ${ASM_DEPEND} ) + java? ( >=virtual/jdk-1.5 )" + +src_prepare() { + if [[ -x ./configure ]]; then + elibtoolize + else + eautoreconf + fi + java-pkg-opt-2_src_prepare +} + +src_configure() { + if use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + econf \ + $(use_enable static-libs static) \ + --with-jpeg${JPEG_ABI} \ + $(use_with java) +} + +src_compile() { + local _java_makeopts + use java && _java_makeopts="-j1" + emake ${_java_makeopts} + + ebegin "Building exifautotran and jpegexiforient extra tools" + pushd ../debian/extra >/dev/null + emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" + popd >/dev/null + eend $? +} + +src_test() { + emake test +} + +src_install() { + emake \ + DESTDIR="${D}" \ + docdir="${EPREFIX}"/usr/share/doc/${PF} \ + install + + find "${ED}"usr -name '*.la' -exec rm -f {} + + + dodoc *.txt change.log example.c README + + 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 + + emake \ + DESTDIR="${D}" prefix="${EPREFIX}"/usr \ + INSTALL="install -m755" INSTALLDIR="install -d -m755" \ + install + popd >/dev/null + eend $? +} diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0.ebuild deleted file mode 100644 index 51d5e4d8c80a..000000000000 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2012 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.2.0.ebuild,v 1.1 2012/02/11 19:09:25 ssuominen Exp $ - -# http://libjpeg-turbo.svn.sourceforge.net/viewvc/libjpeg-turbo/branches/1.2.x/?view=tar - -EAPI=4 - -unset _inherits - -JPEG_ABI=8 - -if [[ ${PV} == *_p20* ]]; then - SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz" - _inherits=autotools -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -fi - -inherit ${_inherits} java-pkg-opt-2 libtool toolchain-funcs - -DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" -HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/" -SRC_URI="${SRC_URI} - mirror://debian/pool/main/libj/libjpeg${JPEG_ABI}/libjpeg${JPEG_ABI}_${JPEG_ABI}d-1.debian.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="java static-libs" - -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" -COMMON_DEPEND="!media-libs/jpeg:0" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" -DEPEND="${COMMON_DEPEND} - amd64? ( ${ASM_DEPEND} ) - x86? ( ${ASM_DEPEND} ) - amd64-linux? ( ${ASM_DEPEND} ) - x86-linux? ( ${ASM_DEPEND} ) - java? ( >=virtual/jdk-1.5 )" - -DOCS="*.txt change.log example.c README" - -src_prepare() { - if [[ -x ./configure ]]; then - elibtoolize - else - eautoreconf - fi - java-pkg-opt-2_src_prepare -} - -src_configure() { - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - - econf \ - $(use_enable static-libs static) \ - --with-jpeg${JPEG_ABI} \ - $(use_with java) -} - -src_compile() { - local _java_makeopts - use java && _java_makeopts="-j1" - emake ${_java_makeopts} - - ebegin "Building exifautotran and jpegexiforient extra tools" - pushd ../debian/extra >/dev/null - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" - popd >/dev/null - eend $? -} - -src_test() { - emake test -} - -src_install() { - default - find "${ED}"usr -name '*.la' -exec rm -f {} + - - 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 - - emake \ - DESTDIR="${D}" prefix="${EPREFIX}"/usr \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install - popd >/dev/null - eend $? -} -- cgit v1.2.3-65-gdbad