[gentoo-commits] repo/gentoo:master commit in: x11-libs/fox/, x11-libs/fox/files/

[Andreas Sturmlechner]

commit:     bd38e8b763b5f24b359b98f77ebff93cfaa335d7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 11:15:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 11:33:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd38e8b7

x11-libs/fox: Drop old slot 1.7 versions

Latest version is stable.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-libs/fox/Manifest           |  2 --
 x11-libs/fox/files/jpeg-9.patch | 40 ----------------------------
 x11-libs/fox/fox-1.7.49.ebuild  | 59 -----------------------------------------
 x11-libs/fox/fox-1.7.53.ebuild  | 54 -------------------------------------
 4 files changed, 155 deletions(-)

diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 455630b4ffd..1b028dabe83 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,5 +1,3 @@
 DIST fox-1.6.49.tar.gz 4383152 BLAKE2B a3d626786086e6b46fc82ce4396bd42d060c234cedf8c182257406de4714c29aae64568bc00a3ad794848eb2faff1a904600f82e4815e9145bcfa87e09390ff2 SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8
 DIST fox-1.6.50.tar.gz 4381855 BLAKE2B eef3bd77d6343a65adf4bcc3a59690b1d47d1e92faf81b01a347aa4fdc46053ab17d05ce4016fd147ee64b66c8e582754536c895b87d3c3e073e45435ab9d4ff SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae
-DIST fox-1.7.49.tar.gz 5336321 BLAKE2B 0fc905c77bcf32783a04b573a18ef79b9017e92126028bf7ec344fc388d3935fabab3d988787c08ea26e2783eb81418d84168e1c1eb733297624a0169a5b45f7 SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9
-DIST fox-1.7.53.tar.gz 5366794 BLAKE2B 166c2b0a59ad39c6749bed443ae7258193096c10d96fa3ad5ddfdf8732a0bc589b786812b7cdc51d23bc825dce5688cc237557e4f50a17c61e9d4328d33d7dab SHA512 835117497e48fe66790be6e985bb8ef80ae1b34966585355b0d72f907863610de9d89792062ae91297488f0e24e77c08102afe253a59e67ca65a071b2a5890c4
 DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795

diff --git a/x11-libs/fox/files/jpeg-9.patch b/x11-libs/fox/files/jpeg-9.patch
deleted file mode 100644
index 8075f03251c..00000000000
--- a/x11-libs/fox/files/jpeg-9.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/lib/fxjpegio.cpp
-+++ b/lib/fxjpegio.cpp
-@@ -138,7 +138,7 @@
-     src->pub.next_input_byte=src->buffer;
-     src->pub.bytes_in_buffer=1;
-     }
--  return true;
-+  return TRUE;
-   }
- 
- 
-@@ -216,7 +216,7 @@
-   srcinfo.src=&src.pub;
- 
-   // read the header from the jpg;
--  jpeg_read_header(&srcinfo,true);
-+  jpeg_read_header(&srcinfo,TRUE);
- 
-   // make sure the output is RGB
-   srcinfo.out_color_space=JCS_RGB;
-@@ -279,7 +279,7 @@
-   dest->stream->save(dest->buffer,JPEG_BUFFER_SIZE);
-   dest->pub.free_in_buffer=JPEG_BUFFER_SIZE;
-   dest->pub.next_output_byte=dest->buffer;
--  return true;
-+  return TRUE;
-   }
- 
- 
-@@ -336,8 +336,8 @@
-   dstinfo.dest=&dst.pub;
- 
-   jpeg_set_defaults(&dstinfo);
--  jpeg_set_quality(&dstinfo,quality,true);
--  jpeg_start_compress(&dstinfo,true);
-+  jpeg_set_quality(&dstinfo,quality,TRUE);
-+  jpeg_start_compress(&dstinfo,TRUE);
- 
-   // Write the jpeg data
-   pp=data;

diff --git a/x11-libs/fox/fox-1.7.49.ebuild b/x11-libs/fox/fox-1.7.49.ebuild
deleted file mode 100644
index 9350cae9bbe..00000000000
--- a/x11-libs/fox/fox-1.7.49.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.7"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
-
-# newish autoconf needed for working mmap check
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	>=sys-devel/autoconf-2.67
-	bzip2? ( app-arch/bzip2 )
-	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/glu virtual/opengl )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2
-		x11-libs/libXft )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-libs/libXt"
-
-src_prepare() {
-	fox_src_prepare
-	epatch "${FILESDIR}/jpeg-9.patch"
-}
-
-src_configure() {
-	FOXCONF="$(use_enable bzip2 bz2lib) \
-		$(use_enable jpeg) \
-		$(use_with opengl) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_with truetype xft) \
-		$(use_enable zlib)" fox_src_configure
-}
-
-src_install() {
-	fox_src_install
-	CP="${ED}/usr/bin/ControlPanel"
-	if [[ -f ${CP} ]] ; then
-		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
-			die "Failed to install ControlPanel"
-	fi
-}
-
-pkg_postinst() {
-	fox_pkg_postinst
-
-	einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
-	einfo "with other packages."
-}

diff --git a/x11-libs/fox/fox-1.7.53.ebuild b/x11-libs/fox/fox-1.7.53.ebuild
deleted file mode 100644
index e381f53882d..00000000000
--- a/x11-libs/fox/fox-1.7.53.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
-
-# newish autoconf needed for working mmap check
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	>=sys-devel/autoconf-2.67
-	bzip2? ( app-arch/bzip2 )
-	jpeg? ( virtual/jpeg:= )
-	opengl? ( virtual/glu virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2
-		x11-libs/libXft )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-libs/libXt"
-
-src_configure() {
-	FOXCONF="$(use_enable bzip2 bz2lib) \
-		$(use_enable jpeg) \
-		$(use_with opengl) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_with truetype xft) \
-		$(use_enable zlib)" fox_src_configure
-}
-
-src_install() {
-	fox_src_install
-	CP="${ED}/usr/bin/ControlPanel"
-	if [[ -f ${CP} ]] ; then
-		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
-			die "Failed to install ControlPanel"
-	fi
-}
-
-pkg_postinst() {
-	fox_pkg_postinst
-
-	einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
-	einfo "with other packages."
-}