summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-22 18:15:58 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-22 18:15:58 +0000
commitba5c50723f6df91bf312ae2165eac155db33d8f9 (patch)
tree584fc6f639c7db140b438f5163f6e3a4813b49ce /media-libs/jpeg
parentMarked ~amd64-linux, bug #411639 (diff)
downloadgentoo-2-ba5c50723f6df91bf312ae2165eac155db33d8f9.tar.gz
gentoo-2-ba5c50723f6df91bf312ae2165eac155db33d8f9.tar.bz2
gentoo-2-ba5c50723f6df91bf312ae2165eac155db33d8f9.zip
drop old now that libjpeg-turbo is stable everywhere
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/jpeg')
-rw-r--r--media-libs/jpeg/ChangeLog6
-rw-r--r--media-libs/jpeg/files/Makefile.in.extra37
-rw-r--r--media-libs/jpeg/jpeg-8c-r1.ebuild61
3 files changed, 5 insertions, 99 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 594fb6bcf650..5435ee81a4fd 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/jpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.128 2012/02/15 00:40:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.129 2012/04/22 18:15:58 ssuominen Exp $
+
+ 22 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> -jpeg-8c-r1.ebuild,
+ -files/Makefile.in.extra:
+ old
15 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> -jpeg-7-r1.ebuild,
-jpeg-8b.ebuild:
diff --git a/media-libs/jpeg/files/Makefile.in.extra b/media-libs/jpeg/files/Makefile.in.extra
deleted file mode 100644
index df81038498f0..000000000000
--- a/media-libs/jpeg/files/Makefile.in.extra
+++ /dev/null
@@ -1,37 +0,0 @@
-CC = @CC@
-EXEEXT = @EXEEXT@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-datarootdir = @datarootdir@
-mandir = @mandir@
-man1dir = $(mandir)/man1
-
-MKDIR_P = @MKDIR_P@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
-SCRIPTS = exifautotran
-PROGRAMS = jpegexiforient$(EXEEXT)
-
-all: $(SCRIPTS) $(PROGRAMS)
-
-jpegexiforient$(EXEEXT): jpegexiforient.c
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
-
-clean:
- rm -f $(PROGRAMS) *.o
-
-install: all
- $(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
- $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)
- $(INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(bindir)
- $(INSTALL_DATA) *.1 $(DESTDIR)$(man1dir)
-
-.PHONY: all clean install
diff --git a/media-libs/jpeg/jpeg-8c-r1.ebuild b/media-libs/jpeg/jpeg-8c-r1.ebuild
deleted file mode 100644
index 35407e75af6a..000000000000
--- a/media-libs/jpeg/jpeg-8c-r1.ebuild
+++ /dev/null
@@ -1,61 +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/jpeg/jpeg-8c-r1.ebuild,v 1.7 2012/02/12 15:48:05 armin76 Exp $
-
-EAPI=4
-
-DEB_PV=7-1
-DEB_PN=libjpeg7
-DEB="${DEB_PN}_${DEB_PV}"
-
-inherit eutils libtool multilib
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
- mirror://gentoo/${DEB}.diff.gz"
-# mirror://debian/pool/main/libj/${DEB_PN}/${DEB}.diff.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DOCS="change.log example.c README *.txt"
-
-src_prepare() {
- epatch "${WORKDIR}"/${DEB}.diff
- epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
- cp "${FILESDIR}"/Makefile.in.extra debian/extra/Makefile.in
- elibtoolize
- # hook the Debian extra dir into the normal jpeg build env
- sed -i '/all:/s:$:\n\t./config.status --file debian/extra/Makefile\n\t$(MAKE) -C debian/extra $@:' Makefile.in
-}
-
-src_configure() {
- # unbreak compilation against this library on Solaris, same issue as on
- # DragonFly BSD:
- # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
- local ldverscript=
- [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
- econf \
- --enable-shared \
- $(use_enable static-libs static) \
- --enable-maxmem=64 \
- ${ldverscript}
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
- ewarn "If you are switching from media-libs/libjpeg-turbo you might need to"
- ewarn "rebuild reverse dependencies:"
- ewarn
- ewarn "# emerge gentoolkit"
- ewarn "# revdep-rebuild --library libjpeg.so.8"
- ewarn
- ewarn "NOTE: The --library argument is important here."
-}