old

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

4 files changed, 13 insertions, 103 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 8db0d2d99e5b..594fb6bcf650 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.127 2012/02/15 00:38:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.128 2012/02/15 00:40:07 ssuominen Exp $
+
+  15 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> -jpeg-7-r1.ebuild,
+  -jpeg-8b.ebuild:
+  old
 
 *jpeg-8d (15 Feb 2012)
 
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index a64d35e2353f..494528afc1f3 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -5,27 +5,23 @@ AUX Makefile.in.extra 814 RMD160 f8cc72b3c7eceb5cfb3413d6f70b37a45794081b SHA1 a
 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.v7.tar.gz 960379 RMD160 6049c5fee2682c0757d4b51740abd981d1b24487 SHA1 88cced0fc3dbdbc82115e1d08abce4e9d23a4b47 SHA256 50b7866206c5be044c4a2b0d7895898f5a58d31b50e16e79cf7dea3b90337ebf
-DIST jpegsrc.v8b.tar.gz 965125 RMD160 18d31a26c447564c258a6f6357e9002536c9ab96 SHA1 15dc1939ea1a5b9d09baea11cceb13ca59e4f9df SHA256 36e6208edec591bae8f2fc370ea4f991447badb6377a125c211ffa7b503174a7
 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-7-r1.ebuild 1018 RMD160 4c29244b5e723930909c9fdb0f0a4d6e5e571081 SHA1 8cbce4e0faa59e678c06be9583d8a0d72ba68034 SHA256 b7f6f91bbc96a5158d4e18dada1d1d9c66a4538833284e8b5f7d72f26522e08b
-EBUILD jpeg-8b.ebuild 1538 RMD160 a9e771a155be5a55085f16661fca8033a78c2d78 SHA1 7096c39fc9fe2d33641b0596db94d473e47ce1e3 SHA256 24f7f0e30f57a9ecec3e70859a28f3e70a03f966b1ec9986c7c2c5e1a116a940
 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 15355 RMD160 82e48d5f414877b5aa3d0469204daaffdb076945 SHA1 421a056301ac6584cc3c281d9ae340a49c2baf7a SHA256 aea6a54aac57f68626bd3625b8612a87bbc0e7a10bb2414550ee1cef464083d3
+MISC ChangeLog 15454 RMD160 3248a03b57f533e98f2f88785b6afb62d5fd842c SHA1 9a736558a12b8a980aaa24fe3b0e3c6674d15eca SHA256 8ccdbd099b808a488c548264f57747c5db3a6315ebb831058ee33cb3a35303f1
 MISC metadata.xml 224 RMD160 3a7dcbadaed2b7ed12e11152fe1fe2de0193fc29 SHA1 fa5078079869e963f3f51f80124cecf8ea6c1b67 SHA256 806818bba7ae36d62f16c1fe548a1eb2a360caf2d984aa8f47bba7b91ff73434
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPOv3rAAoJEEdUh39IaPFN0ygIAJPcL/dpq7lHc8OKo96yzyP2
-7o5Oa6cA86VRtiiCPs5sixIk03M4RjaFqDPlRzToSnnIGtBpm9OGR14tzw92iGAI
-CMbaEB82CQmHsiyYscYsi8ruS3LAxKYztNIDPeE2idvJTo5oMG4xqr4PVg+9bvlZ
-VSYWR+uBEqYMpAZI4H3yZ5L9ExodHnxE65v8sS7kvwK8MEuHru4aQlrx02kC61kP
-IYtSTsAF0L2f0ccWDPLmCs5QrPMLf19MuVKiGcov8jFVyFI2guU+qC3EvB9ksrlC
-SjpyIeS0xeDcYMp+PpfYixDrSJgFa4e0ydeugos1gK/0cADYC4KS/qQ2ucNOtk4=
-=HePr
+iQEcBAEBAgAGBQJPOv40AAoJEEdUh39IaPFNLPQH/jf/tmz53Mre8hWsM1GnE/bT
+v2LB5eakuxDZYUTuCnreVfRg2MQNhidl47a4FogQ0JF3xuXZ0Kni1x65BqJSk7qx
+/AI5f7OYugcPolV+VcHBi+Gc9CB+EUoP13qDAQDTteXvU31IB1+6zd4FXD8m47Ju
+QSx71pAtX3dzUkmqNtTpCj9cBPsO1khFU8Qri6B3iCsdoWV36YKn6D9Qi7TLmsAP
+0gIug6Bs1HXep/1ZC04RkyEIXe2APmY0lWlCJSQmKdn9TCPTeHTcdudw3FDpigXe
+2hud5VJOmK4h9PDyN2/r6xp6yq80Vi9DY6eMPkSBJJz3qW3FtcBPRNttbbSiZqg=
+=jeVy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jpeg/jpeg-7-r1.ebuild b/media-libs/jpeg/jpeg-7-r1.ebuild
deleted file mode 100644
index a9a85149dc89..000000000000
--- a/media-libs/jpeg/jpeg-7-r1.ebuild
+++ /dev/null
@@ -1,40 +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-7-r1.ebuild,v 1.4 2012/01/28 00:01:19 ssuominen Exp $
-
-# this ebuild is only for the libjpeg.so.7 SONAME for ABI compat
-
-EAPI=4
-PATCH_VER=2
-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/${PN}-6b-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	epatch "${WORKDIR}"/patch/60_all_jpeg-maxmem-sysconf.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static \
-		--enable-maxmem=64
-}
-
-src_compile() {
-	emake libjpeg.la
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)
-	doexe .libs/libjpeg.so.7
-}
diff --git a/media-libs/jpeg/jpeg-8b.ebuild b/media-libs/jpeg/jpeg-8b.ebuild
deleted file mode 100644
index 92923fc855f8..000000000000
--- a/media-libs/jpeg/jpeg-8b.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8b.ebuild,v 1.10 2011/01/06 00:03:56 ssuominen Exp $
-
-EAPI="3"
-
-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://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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${DEB}.diff
-	cp "${FILESDIR}"/Makefile.in.extra debian/extra/Makefile.in
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
-	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() {
-	econf \
-		--disable-dependency-tracking \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc change.log example.c README *.txt
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}