drop old now that libjpeg-turbo is stable everywhere

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 14 insertions, 112 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/Manifest b/media-libs/jpeg/Manifest
index 494528afc1f3..c43fc170375a 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,27 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX Makefile.in.extra 814 RMD160 f8cc72b3c7eceb5cfb3413d6f70b37a45794081b SHA1 aa15a6662862b6e4459b44d98957011f491e8ac3 SHA256 067806da66421b303a155243bd80d729a10ca3f15182490fef3e55fc17ad9cf4
 AUX jpeg-7-maxmem_sysconf.patch 1313 RMD160 5c6821fc4150b95e67e61bbf330362d938e58d46 SHA1 0b9b6741e58e2964a15a520aa23ab23534d6e92d SHA256 92d08b14ade2f42291d3de8074f5e4f9dd3c64dd9ec227bc770a0825187202de
 DIST jpeg-6b-patches-2.tar.bz2 3703 RMD160 71f15f911baa0c60d5b2d78069c25f8a23f367b1 SHA1 dfb1a237f0984d3d3f03cdf3503b1ce72d50a81b SHA256 62d8496764330c57cc29137ee46c3cd76ce6463680f9e2e63af8bc4483439b2d
 DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 SHA1 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
-DIST jpegsrc.v8c.tar.gz 986681 RMD160 b8455bec3e0d370069c64cc0bd41d25a859dc796 SHA1 f0a3b88ac4db19667798bee971537eeed552bce9 SHA256 edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a
 DIST jpegsrc.v8d.tar.gz 991456 RMD160 b268252793b8050a25baf12d2bb07a507cbefb5d SHA1 f080b2fffc7581f7d19b968092ba9ebc234556ff SHA256 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3
-DIST libjpeg7_7-1.diff.gz 11554 RMD160 193bcb5fdc7360707cbb450c16888499085dd2c6 SHA1 b346d8f7803d08feccade84a0012a48ee2b5f62e SHA256 e465ab295502c6db995780d3b2e38570794d0d31034f0065352bcbda63c3a094
 DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057
 EBUILD jpeg-6b-r9.ebuild 1013 RMD160 f6d15393d2231a128ac9bc08bc8b9bcfa40878c0 SHA1 40e74055d224470b900fffe44794b4366118aab6 SHA256 d27c7751267b14b11f47f1a85ee0a48696a4e5c63ea6ab91aecf5f3b55fdb378
-EBUILD jpeg-8c-r1.ebuild 2032 RMD160 4a8c2a5d8847bdfd1cef98e8fa24dd3f83358372 SHA1 91971f1358224ba015d15e0bf521c52071e5627b SHA256 cd0fba882967a28fe6ba4c7b271af1523e8c71c64333ab5635784b9e15068e52
 EBUILD jpeg-8d.ebuild 2025 RMD160 43d067bfa38e566696bafd73583f8dfdce1feb25 SHA1 de0bc7c2bee2e1e46e1da302888428cf99138ae6 SHA256 b7fbbe6d59e505dc4f5450276d8a9ec2c61b9eec01533e763d7e304682ec3263
-MISC ChangeLog 15454 RMD160 3248a03b57f533e98f2f88785b6afb62d5fd842c SHA1 9a736558a12b8a980aaa24fe3b0e3c6674d15eca SHA256 8ccdbd099b808a488c548264f57747c5db3a6315ebb831058ee33cb3a35303f1
+MISC ChangeLog 15563 RMD160 35d629cad8afe90f0c3dbee7f5c478039e1f687b SHA1 8be61737636f14523ae13e0e8442c0ee261336b2 SHA256 6cc4a3c23d5eabd26f02593626587a9cfdb651d315c812d5ea101d098ffc8568
 MISC metadata.xml 224 RMD160 3a7dcbadaed2b7ed12e11152fe1fe2de0193fc29 SHA1 fa5078079869e963f3f51f80124cecf8ea6c1b67 SHA256 806818bba7ae36d62f16c1fe548a1eb2a360caf2d984aa8f47bba7b91ff73434
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPOv40AAoJEEdUh39IaPFNLPQH/jf/tmz53Mre8hWsM1GnE/bT
-v2LB5eakuxDZYUTuCnreVfRg2MQNhidl47a4FogQ0JF3xuXZ0Kni1x65BqJSk7qx
-/AI5f7OYugcPolV+VcHBi+Gc9CB+EUoP13qDAQDTteXvU31IB1+6zd4FXD8m47Ju
-QSx71pAtX3dzUkmqNtTpCj9cBPsO1khFU8Qri6B3iCsdoWV36YKn6D9Qi7TLmsAP
-0gIug6Bs1HXep/1ZC04RkyEIXe2APmY0lWlCJSQmKdn9TCPTeHTcdudw3FDpigXe
-2hud5VJOmK4h9PDyN2/r6xp6yq80Vi9DY6eMPkSBJJz3qW3FtcBPRNttbbSiZqg=
-=jeVy
+iQEcBAEBAgAGBQJPlEqDAAoJEEdUh39IaPFNiYkH/3Kkonbw0kRocxfTrchSdiwT
+YRgdCJj5SilVR5v5dZvt+SLFXsSlP2bJVnyXa45EjCrwd9ln73gKZtlRMCgtE05Z
+HATMZAZIc3fsjwRJSS3fctkGZCSt9axh4T/66dQNYaufAHKrNXq8uFD/akOMJQT1
+4daIgbEaZrSI4RbLjz4nkBPs4nqQxgY8GmVuzSNJv92ug0GJOG+j0a3Dn2bXNJ6s
+u4WWetORpFg5/TEjK38wO8+dSwfRvtrp8JzSbFmACMaN8DtcDU5iY7uNB5wI98Gc
+8+Ys5wMElmEjq8UN4Y+LQndDOz879ZxrDw/xhDglwKK71lqjTQyklj5SEgICu5c=
+=viqT
 -----END PGP SIGNATURE-----
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."
-}