commit:     aff424755d1a2e7628979e165ff134a8f9ea9ef4
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 07:16:11 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun May 29 07:16:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff42475

x11-misc/i855crt: treeclean

Closes: https://bugs.gentoo.org/833144
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 profiles/package.mask                             |  5 --
 x11-misc/i855crt/Manifest                         |  1 -
 x11-misc/i855crt/files/i855crt-0.4-makefile.patch | 16 ------
 x11-misc/i855crt/files/i855crt-i915support.diff   | 70 -----------------------
 x11-misc/i855crt/i855crt-0.4-r1.ebuild            | 42 --------------
 x11-misc/i855crt/metadata.xml                     | 12 ----
 6 files changed, 146 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 0791d11a55f4..dbc47ca682a9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -554,11 +554,6 @@ net-p2p/arti
 <sci-electronics/kicad-templates-6.0.2
 <app-doc/kicad-doc-6.0.2
 
-# Jonas Stein <[email protected]> (2022-02-11)
-# Not usable anymore
-# Removal after 2022-06-01.  Bug #833144.
-x11-misc/i855crt
-
 # Jonas Stein <[email protected]> (2022-02-08)
 # Not maintained, open bugs, upstream outdated.
 # Removal after 2022-07-01.  Bug #832953.

diff --git a/x11-misc/i855crt/Manifest b/x11-misc/i855crt/Manifest
deleted file mode 100644
index f043529d5eea..000000000000
--- a/x11-misc/i855crt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST i855crt-0.4.tar.gz 65209 BLAKE2B 
a7c8e041cb66cd711e1cdf7ac1ee0d6d218377b5c1183c11c658d3345de814a21b9eab0c4579c56db316a3b5fb3e430774174100f989c921e86650bc59adc1ee
 SHA512 
8bd6d05334bcbe75f85c128ffe1179368fcf94bb0ba07c2ea7ce9b6ed38252ffc5dcd7a3208f6524be064bea595abda5a29f6a2960ad9f2f7b6f6ba528c36290

diff --git a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch 
b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
deleted file mode 100644
index e7deffb4d30a..000000000000
--- a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,6 @@
--i855crt: i855crt.o vmodes.o
--      gcc $(LDFLAGS) -o i855crt i855crt.o vmodes.o -L /usr/X11R6/lib -lXext 
-lXv
-+LDLIBS = -lXv -lX11
- 
--i855crt.o: i855crt.c i855crt.h vmodes.h hw.h
--      gcc $(CFLAGS) -c i855crt.c
--
--vmodes.o: vmodes.c vmodes.h
--      gcc $(CFLAGS) -c vmodes.c
-+i855crt: vmodes.o
- 
- clean:
-       rm *.o -f

diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff 
b/x11-misc/i855crt/files/i855crt-i915support.diff
deleted file mode 100644
index 5aea3a7dd96c..000000000000
--- a/x11-misc/i855crt/files/i855crt-i915support.diff
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/dumpreg.c
-+++ b/dumpreg.c
-@@ -36,10 +36,11 @@
-               (p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
-               (p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
-               (p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
--              (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
-+              (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
-               (p = strstr(*buff_ptr, I830STR)) != NULL ||
-               (p = strstr(*buff_ptr, I845STR)) != NULL ||
--              (p = strstr(*buff_ptr, I865STR)) != NULL ;
-+              (p = strstr(*buff_ptr, I865STR)) != NULL ||
-+              (p = strstr(*buff_ptr, I915STR)) != NULL ;
-       
-               if(i)
-               {
-@@ -89,7 +90,7 @@
-       chip = i810_chip(&buff, &len, pci_f);
-       if (chip == NULL) 
-       {
--              fprintf(stderr, "No know videocard has been found.\n");
-+              fprintf(stderr, "No known videocard has been found.\n");
-               exit(1);
-       }
-       pclose(pci_f);
---- a/i855crt.c
-+++ b/i855crt.c
-@@ -254,14 +254,15 @@
-               (p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
-               (p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
-               (p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
--              (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
-+              (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
-               (p = strstr(*buff_ptr, I830STR)) != NULL ||
-               (p = strstr(*buff_ptr, I845STR)) != NULL ||
--              (p = strstr(*buff_ptr, I865STR)) != NULL ;
-+              (p = strstr(*buff_ptr, I865STR)) != NULL ||
-+              (p = strstr(*buff_ptr, I915STR)) != NULL ;
-       
-               if(i)
-               {
--                      fprintf(stderr,"This driver is untested with your 
videocard !\n");  
-+                      fprintf(stderr,"This driver is untested with your video 
card !\n");  
-                       return p;
-               }
-               
-@@ -493,7 +494,7 @@
-       chip = i810_chip(&buff, &len, pci_f);
-       if (chip == NULL) 
-       {
--              fprintf(stderr, "No know videocard has been found.\n");
-+              fprintf(stderr, "No known videocard has been found.\n");
-               exit(1);
-       }
-       pclose(pci_f);
---- a/i855crt.h
-+++ b/i855crt.h
-@@ -1,3 +1,4 @@
-+
- /* 
- * This is part of the source for i855crt driver
- * copyright(c) Merello Andrea 2004
-@@ -45,6 +46,7 @@
- #define I845STR                       "8086:2562"
- #define I855STR                       "8086:3582"
- #define I865STR                       "8086:2572"
-+#define I915STR                       "8086:2592"
- #define MEMSTR                        "Memory at"
- #define NONPRSTR              "32-bit, non-prefetchable"
- 

diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild 
b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
deleted file mode 100644
index 25df8327c91c..000000000000
--- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
-HOMEPAGE="http://i855crt.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND="
-       x11-libs/libX11
-       x11-libs/libXv"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-i915support.diff
-       "${FILESDIR}"/${PN}-0.4-makefile.patch
-)
-
-src_prepare() {
-       default
-
-       # upstream ships it with the binary, we want to make sure we compile it
-       emake clean
-}
-
-src_configure() {
-       tc-export CC
-}
-
-src_install() {
-       dobin i855crt
-       insinto /etc
-       doins i855crt.conf
-       einstalldocs
-}

diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml
deleted file mode 100644
index 5e2d40ca2392..000000000000
--- a/x11-misc/i855crt/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<!-- maintainer-needed -->
-       <longdescription lang="en">
-i855crt is a tool to send the output of a i855-based graphic card to the
-external VGA, primarily used for presentations.
-</longdescription>
-       <upstream>
-               <remote-id type="sourceforge">i855crt</remote-id>
-       </upstream>
-</pkgmetadata>

Reply via email to