[gentoo-commits] proj/kde-sunset:master commit in: dev-db/qt-unixODBC/files/, dev-db/qt-unixODBC/

[Andreas Sturmlechner]

commit:     b0d301b28c8e395e8d6f57f00c8e285e48a01817
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 01:23:59 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 01:24:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b0d301b2

dev-db/qt-unixODBC: Drop Qt3 adjacent package

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-db/qt-unixODBC/ChangeLog                    | 179 ------------------------
 dev-db/qt-unixODBC/files/qt-no-rpath.patch      |  11 --
 dev-db/qt-unixODBC/files/unixODBC-2.2.14.patch  |  39 ------
 dev-db/qt-unixODBC/metadata.xml                 |   5 -
 dev-db/qt-unixODBC/qt-unixODBC-3.3.8b-r1.ebuild |  71 ----------
 dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild    |  70 ---------
 6 files changed, 375 deletions(-)

diff --git a/dev-db/qt-unixODBC/ChangeLog b/dev-db/qt-unixODBC/ChangeLog
deleted file mode 100644
index 5a8a6b09..00000000
--- a/dev-db/qt-unixODBC/ChangeLog
+++ /dev/null
@@ -1,179 +0,0 @@
-# ChangeLog for dev-db/qt-unixODBC
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.45 2009/04/27 20:06:56 hwoarang Exp $
-
-  21 Mar 2013; Lars Wendler <polynomial-c@g.o>
-  qt-unixODBC-3.3.8b.ebuild, qt-unixODBC-3.3.8b-r1.ebuild:
-  Fixed dependencies on qt packages.
-
-*qt-unixODBC-3.3.8b-r1 (23 Mar 2010)
-
-  23 Mar 2010; Martin von Gagern (MvG) <Martin.vGagern@×××.net>
-  +files/unixODBC-2.2.14.patch, qt-unixODBC-3.3.8b.ebuild,
-  +qt-unixODBC-3.3.8b-r1.ebuild:
-  Restore compatibility with dev-db/unixODBC-2.2.14
-
-  27 Apr 2009; Markos Chandras <hwoarang@g.o>
-  -qt-unixODBC-3.3.8.ebuild:
-  Remove masked file
-
-  17 Jan 2009; nixnut <nixnut@g.o> qt-unixODBC-3.3.8b.ebuild:
-  ppc stable #254153
-
-  10 Jan 2009; Raúl Porcel <armin76@g.o> qt-unixODBC-3.3.8b.ebuild:
-  alpha/ia64/sparc/x86 stable wrt #254153
-
-  09 Jan 2009; Guy Martin <gmsoft@g.o> qt-unixODBC-3.3.8b.ebuild:
-  hppa stable, #254153
-
-  07 Jan 2009; Thomas Anderson <gentoofan23@g.o>
-  qt-unixODBC-3.3.8b.ebuild:
-  stable amd64, dependency for bug 253978
-
-  07 Jan 2009; Brent Baude <ranger@g.o> qt-unixODBC-3.3.8b.ebuild:
-  Marking qt-unixODBC-3.3.8b ppc64 for bug 253978
-
-*qt-unixODBC-3.3.8b (26 Jul 2008)
-
-  26 Jul 2008; Carsten Lohrke <carlo@g.o> +qt-unixODBC-3.3.8b.ebuild:
-  Version bump.
-
-  21 May 2008; Ingmar Vanhassel <ingmar@g.o>
-  -qt-unixODBC-3.3.4-r1.ebuild:
-  Old.
-
-  27 Mar 2008; Bo Ørsted Andresen <zlin@g.o>
-  qt-unixODBC-3.3.8.ebuild:
-  Respect user's CFLAGS (bug #181789). Fix quoting. Use doins.
-
-  13 Mar 2008; <ricmm@g.o> qt-unixODBC-3.3.4-r1.ebuild:
-  Drop to ~mips due to unstable deps
-
-  03 May 2007; Caleb Tennis <caleb@g.o> qt-unixODBC-3.3.4-r1.ebuild:
-  readd amd64 as it likes this version for hardened as well
-
-  20 Apr 2007; Caleb Tennis <caleb@g.o> -qt-unixODBC-3.3.6.ebuild:
-  remove 3.3.6 as it's qt 3.3.6 isn't in portage anymore
-
-  18 Apr 2007; Jose Luis Rivero <yoswink@g.o>
-  qt-unixODBC-3.3.8.ebuild:
-  Stable on alpha wrt security #172746
-
-  13 Apr 2007; Gustavo Zacarias <gustavoz@g.o>
-  qt-unixODBC-3.3.8.ebuild:
-  Stable on sparc wrt security #172746
-
-  12 Apr 2007; Jeroen Roovers <jer@g.o> qt-unixODBC-3.3.8.ebuild:
-  Stable for HPPA (bug #172746).
-
-  11 Apr 2007; Tobias Scherbaum <dertobi123@g.o>
-  qt-unixODBC-3.3.8.ebuild:
-  ppc stable, bug #172746
-
-  11 Apr 2007; Markus Rothe <corsair@g.o> qt-unixODBC-3.3.8.ebuild:
-  Stable on ppc64; bug #172746
-
-  11 Apr 2007; Raúl Porcel <armin76@g.o> qt-unixODBC-3.3.8.ebuild:
-  ia64 + x86 stable wrt security bug 172746
-
-  11 Apr 2007; Marcus D. Hanwell <cryos@g.o>
-  qt-unixODBC-3.3.8.ebuild:
-  Stable on amd64, bug 172746.
-
-*qt-unixODBC-3.3.8 (22 Feb 2007)
-
-  22 Feb 2007; Caleb Tennis <caleb@g.o> +qt-unixODBC-3.3.8.ebuild:
-  Bump to Qt 3.3.8
-
-  22 Feb 2007; Piotr Jaroszyński <peper@g.o> ChangeLog:
-  Transition to Manifest2.
-
-  15 Oct 2006; Bryan Østergaard <kloeri@g.o>
-  qt-unixODBC-3.3.6.ebuild:
-  Stable on ia64, bug 132887.
-
-  17 Jul 2006; Caleb Tennis <caleb@g.o> -qt-unixODBC-3.3.5.ebuild:
-  removing unneeded version
-
-  30 May 2006; Chris Gianelloni <wolf31o2@g.o>
-  qt-unixODBC-3.3.6.ebuild:
-  Stable on amd64 wrt bug #132887.
-
-  25 May 2006; Guy Martin <gmsoft@g.o> qt-unixODBC-3.3.6.ebuild:
-  Stable on hppa.
-
-  22 May 2006; Caleb Tennis <caleb@g.o> -qt-unixODBC-3.3.4.ebuild:
-  remove for GSLA 200510-14
-
-  12 May 2006; Thomas Cort <tcort@g.o> qt-unixODBC-3.3.6.ebuild:
-  Stable on alpha wrt Bug #132887.
-
-  12 May 2006; Chris Gianelloni <wolf31o2@g.o>
-  qt-unixODBC-3.3.6.ebuild:
-  Marking stable on x86 wrt bug #132887.
-
-  12 May 2006; Luca Barbato <lu_zero@g.o> qt-unixODBC-3.3.6.ebuild:
-  Marked ppc
-
-  12 May 2006; Jason Wever <weeve@g.o> qt-unixODBC-3.3.6.ebuild:
-  Stable on SPARC wrt bug #132887.
-
-  11 May 2006; Markus Rothe <corsair@g.o> qt-unixODBC-3.3.6.ebuild:
-  Stable on ppc64; bug #132887
-
-*qt-unixODBC-3.3.6 (17 Mar 2006)
-
-  17 Mar 2006; Caleb Tennis <caleb@g.o> +qt-unixODBC-3.3.6.ebuild:
-  bumped to 3.3.6
-
-  29 Sep 2005; Hardave Riar <hardave@g.o>
-  qt-unixODBC-3.3.4-r1.ebuild:
-  Stable on mips, dep of bug #105695.
-
-  22 Sep 2005; Mark Loeser <halcy0n@g.o> qt-unixODBC-3.3.4-r1.ebuild:
-  Stable on x86; bug #105695.
-
-  20 Sep 2005; Marcus D. Hanwell <cryos@g.o>
-  qt-unixODBC-3.3.4-r1.ebuild:
-  Stable on amd64, bug 105695.
-
-  20 Sep 2005; Michael Hanselmann <hansmi@g.o>
-  qt-unixODBC-3.3.4-r1.ebuild:
-  Stable on hppa, ppc.
-
-  20 Sep 2005; Gustavo Zacarias <gustavoz@g.o>
-  qt-unixODBC-3.3.4-r1.ebuild:
-  Stable on sparc wrt #105695
-
-*qt-unixODBC-3.3.4-r1 (20 Sep 2005)
-
-  20 Sep 2005; Caleb Tennis <caleb@g.o> +files/qt-no-rpath.patch,
-  +qt-unixODBC-3.3.4-r1.ebuild, qt-unixODBC-3.3.5.ebuild:
-  Rev bump to add qt-no-rpatch.patch from qt ebuild to make the portage
-  RUNPATH error checker happy
-
-*qt-unixODBC-3.3.5 (17 Sep 2005)
-
-  17 Sep 2005; Caleb Tennis <caleb@g.o> +qt-unixODBC-3.3.5.ebuild:
-  Version bump
-
-  17 Sep 2005; Aron Griffis <agriffis@g.o> qt-unixODBC-3.3.4.ebuild:
-  Mark 3.3.4 stable on ia64
-
-  10 Sep 2005; Aron Griffis <agriffis@g.o> qt-unixODBC-3.3.4.ebuild:
-  Mark 3.3.4 stable on alpha
-
-  09 Sep 2005; Tom Gall <tgall@g.o> qt-unixODBC-3.3.4.ebuild:
-  stable on ppc64 bug #14178
-
-*qt-unixODBC-3.3.4 (01 Jul 2005)
-
-  01 Jul 2005; Dan Armak <danarmak@g.o> -qt-unixODBC-3.3.3.ebuild,
-  +qt-unixODBC-3.3.4.ebuild:
-  Added 3.3.4 version. Unmasking. Cf bug 14178.
-
-*qt-ODBC-3.3.3 (23 Oct 2004)
-
-  23 Oct 2004; Dan Armak <danarmak@g.o> qt-ODBC-3.3.3.ebuild:
-  First created. A separate ebuild for the QT unixODBC plugin to fix #14178.
-  

diff --git a/dev-db/qt-unixODBC/files/qt-no-rpath.patch b/dev-db/qt-unixODBC/files/qt-no-rpath.patch
deleted file mode 100644
index a7d78547..00000000
--- a/dev-db/qt-unixODBC/files/qt-no-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mkspecs/linux-g++/qmake.conf.orig	2004-12-21 14:57:27.315410728 -0500
-+++ mkspecs/linux-g++/qmake.conf	2004-12-21 14:57:40.129462696 -0500
-@@ -56,7 +56,7 @@
- QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME	= -Wl,-soname,
- QMAKE_LFLAGS_THREAD	=
--QMAKE_RPATH		= -Wl,-rpath,
-+QMAKE_RPATH		=
- 
- QMAKE_LIBS		=
- QMAKE_LIBS_DYNLOAD	= -ldl

diff --git a/dev-db/qt-unixODBC/files/unixODBC-2.2.14.patch b/dev-db/qt-unixODBC/files/unixODBC-2.2.14.patch
deleted file mode 100644
index 1e865715..00000000
--- a/dev-db/qt-unixODBC/files/unixODBC-2.2.14.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef
-declaration instead of preprocessor #define macro definition.  This breaks
-the checks at the head of qsql_odbc.cpp, causing the source to fall back to
-older types instead, leading to compile time errors like this:
-
-qsql_odbc.cpp:285: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to
-‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’
-...
-qsql_odbc.cpp:1227: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘10’ to
-‘SQLRETURN SQLBindParameter(void*, SQLUSMALLINT, SQLSMALLINT, SQLSMALLINT, SQLSMALLINT, SQLULEN, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’
-
-This change hard-wires the new names, breaking compatibility with older
-unixODBC versions (don't know what version number ranges) in favour of
-support for newer releases like 2.2.14.
-
-2010-03-23 Martin von Gagern
-
-Index: qt-x11-free-3.3.8b/src/sql/drivers/odbc/qsql_odbc.cpp
-===================================================================
---- qt-x11-free-3.3.8b.orig/src/sql/drivers/odbc/qsql_odbc.cpp
-+++ qt-x11-free-3.3.8b/src/sql/drivers/odbc/qsql_odbc.cpp
-@@ -61,17 +61,8 @@
- #endif
- 
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
- # define QSQLLEN SQLLEN
--#else
--# define QSQLLEN SQLINTEGER
--#endif
--
--#ifdef SQLULEN
- # define QSQLULEN SQLULEN
--#else
--# define QSQLULEN SQLUINTEGER
--#endif
- 
- 
- static const QSQLLEN COLNAMESIZE = 256;

diff --git a/dev-db/qt-unixODBC/metadata.xml b/dev-db/qt-unixODBC/metadata.xml
deleted file mode 100644
index 6f49eba8..00000000
--- a/dev-db/qt-unixODBC/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b-r1.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b-r1.ebuild
deleted file mode 100644
index b1e73317..00000000
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild,v 1.6 2009/01/17 16:39:16 nixnut Exp $
-
-inherit eutils
-
-SRCTYPE="free"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
-IUSE=""
-LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="~dev-qt/qt-meta-${PV}
-	dev-db/unixODBC"
-DEPEND="${RDEPEND}
-	>=dev-db/unixODBC-2.2.14"
-
-S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}"
-
-QTBASE="/usr/qt/3"
-export QTDIR=${S}
-export PLATFORM=linux-g++
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/qt-no-rpath.patch
-	epatch "${FILESDIR}"/unixODBC-2.2.14.patch
-
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		   -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		   -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
-		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
-		   -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
-		   -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
-		   "${S}"/mkspecs/${PLATFORM}/qmake.conf || die "sed to fix CFLAGS failed"
-}
-
-src_compile() {
-	export QTDIR=${S}
-	export SYSCONF=${D}${QTBASE}/etc/settings
-
-	# Let's just allow writing to these directories during Qt emerge
-	# as it makes Qt much happier.
-	addwrite "${QTBASE}/etc/settings"
-	addwrite "${HOME}/.qt"
-
-	export YACC='byacc -d'
-
-	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
-		-dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die "configure failed"
-
-	cd "${S}"/plugins/src/sqldrivers/odbc
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto ${QTBASE}/plugins/sqldrivers
-	doins "${S}"/plugins/sqldrivers/libqsqlodbc.so || die "doins failed"
-}

diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild
deleted file mode 100644
index b5be6775..00000000
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild,v 1.6 2009/01/17 16:39:16 nixnut Exp $
-
-inherit eutils
-
-SRCTYPE="free"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
-IUSE=""
-LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="~dev-qt/qt-meta-${PV}
-	dev-db/unixODBC"
-DEPEND="${RDEPEND}
-	<dev-db/unixODBC-2.2.14"
-
-S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}"
-
-QTBASE="/usr/qt/3"
-export QTDIR=${S}
-export PLATFORM=linux-g++
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/qt-no-rpath.patch
-
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		   -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		   -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
-		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
-		   -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
-		   -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
-		   "${S}"/mkspecs/${PLATFORM}/qmake.conf || die "sed to fix CFLAGS failed"
-}
-
-src_compile() {
-	export QTDIR=${S}
-	export SYSCONF=${D}${QTBASE}/etc/settings
-
-	# Let's just allow writing to these directories during Qt emerge
-	# as it makes Qt much happier.
-	addwrite "${QTBASE}/etc/settings"
-	addwrite "${HOME}/.qt"
-
-	export YACC='byacc -d'
-
-	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
-		-dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die "configure failed"
-
-	cd "${S}"/plugins/src/sqldrivers/odbc
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto ${QTBASE}/plugins/sqldrivers
-	doins "${S}"/plugins/sqldrivers/libqsqlodbc.so || die "doins failed"
-}