summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-08-22 22:56:10 +0000
committerJohannes Huber <johu@gentoo.org>2012-08-22 22:56:10 +0000
commit7edd717a98ec50a867fa4558512366abc346e0ee (patch)
treedf7b75fe6663a0818d89e4dd4d1c55253190b170 /net-misc
parentStable for x86, wrt bug #429180 (diff)
downloadgentoo-2-7edd717a98ec50a867fa4558512366abc346e0ee.tar.gz
gentoo-2-7edd717a98ec50a867fa4558512366abc346e0ee.tar.bz2
gentoo-2-7edd717a98ec50a867fa4558512366abc346e0ee.zip
Remove old.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/italc/ChangeLog9
-rw-r--r--net-misc/italc/files/italc-1.0.9-as-needed.patch11
-rw-r--r--net-misc/italc/files/italc-1.0.9-gcc44.patch23
-rw-r--r--net-misc/italc/files/italc-1.0.9-gcc45.patch13
-rw-r--r--net-misc/italc/files/italc-1.0.9-qt4-libpath.patch14
-rw-r--r--net-misc/italc/files/italc-1.0.9-strip.patch16
-rw-r--r--net-misc/italc/files/italc-1.0.9-system-libvncserver.patch52
-rw-r--r--net-misc/italc/italc-1.0.9.ebuild114
-rw-r--r--net-misc/italc/metadata.xml3
9 files changed, 8 insertions, 247 deletions
diff --git a/net-misc/italc/ChangeLog b/net-misc/italc/ChangeLog
index be27dbfc18d5..64184bd0d57e 100644
--- a/net-misc/italc/ChangeLog
+++ b/net-misc/italc/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-misc/italc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/ChangeLog,v 1.31 2012/08/22 22:52:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/ChangeLog,v 1.32 2012/08/22 22:56:09 johu Exp $
+
+ 22 Aug 2012; Johannes Huber <johu@gentoo.org>
+ -files/italc-1.0.9-as-needed.patch, -files/italc-1.0.9-gcc44.patch,
+ -files/italc-1.0.9-gcc45.patch, -files/italc-1.0.9-qt4-libpath.patch,
+ -files/italc-1.0.9-strip.patch, -files/italc-1.0.9-system-libvncserver.patch,
+ -italc-1.0.9.ebuild, metadata.xml:
+ Remove old.
22 Aug 2012; Johannes Huber <johu@gentoo.org> italc-2.0.0.ebuild:
Stable for x86, wrt bug #429180
diff --git a/net-misc/italc/files/italc-1.0.9-as-needed.patch b/net-misc/italc/files/italc-1.0.9-as-needed.patch
deleted file mode 100644
index b0c03b38f2a3..000000000000
--- a/net-misc/italc/files/italc-1.0.9-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- italc-1.0.9.orig/setup/Makefile.am 2008-02-09 12:14:52.000000000 +0100
-+++ italc-1.0.9/setup/Makefile.am 2009-10-16 15:14:21.086898900 +0200
-@@ -65,7 +65,7 @@
- PLATFORM_LDADD = ../lib/libitalc_core-static.a
- endif
-
--setup_LDADD = $(QT_LDADD) $(QT_LIB_GUI) $(LIBSSL_LDADD) -ljpeg $(PLATFORM_LDADD)
-+setup_LDADD = $(PLATFORM_LDADD) $(QT_LDADD) $(QT_LIB_GUI) $(LIBSSL_LDADD) -ljpeg
- setup_LDFLAGS = $(LDFLAGS) -mwindows
-
- AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS)
diff --git a/net-misc/italc/files/italc-1.0.9-gcc44.patch b/net-misc/italc/files/italc-1.0.9-gcc44.patch
deleted file mode 100644
index 44f2904d18c9..000000000000
--- a/net-misc/italc/files/italc-1.0.9-gcc44.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur italc-1.0.9.orig/lib/include/types.h italc-1.0.9/lib/include/types.h
---- italc-1.0.9.orig/lib/include/types.h 2008-02-10 01:03:25.000000000 +0200
-+++ italc-1.0.9/lib/include/types.h 2009-07-30 11:03:00.000000000 +0300
-@@ -25,6 +25,8 @@
- #ifndef _TYPES_H
- #define _TYPES_H
-
-+#include <stdint.h>
-+
- typedef signed char Q_INT8; /* 8 bit signed */
- typedef unsigned char Q_UINT8; /* 8 bit unsigned */
- typedef short Q_INT16; /* 16 bit signed */
-diff -ur italc-1.0.9.orig/lib/src/fast_qimage.cpp italc-1.0.9/lib/src/fast_qimage.cpp
---- italc-1.0.9.orig/lib/src/fast_qimage.cpp 2008-03-17 10:02:33.000000000 +0200
-+++ italc-1.0.9/lib/src/fast_qimage.cpp 2009-07-30 10:56:19.000000000 +0300
-@@ -52,6 +52,7 @@
- pete@shinners.org
- */
-
-+#include <stdint.h>
-
- #define ALIGN_SIZE 16
-
diff --git a/net-misc/italc/files/italc-1.0.9-gcc45.patch b/net-misc/italc/files/italc-1.0.9-gcc45.patch
deleted file mode 100644
index d4ee44e2a7f8..000000000000
--- a/net-misc/italc/files/italc-1.0.9-gcc45.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: italc-1.0.9/lib/include/isd_base.h
-===================================================================
---- italc-1.0.9.orig/lib/include/isd_base.h
-+++ italc-1.0.9/lib/include/isd_base.h
-@@ -191,7 +191,7 @@ qint64 IC_DllExport qtcpsocketDispatcher
-
-
-
--typedef struct
-+typedef struct mystruct
- {
- enum commands
- {
diff --git a/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch b/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch
deleted file mode 100644
index b2c92c7aa05d..000000000000
--- a/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./italc-1.0.9/acinclude.m4 2008-05-24 11:19:33.000000000 +0200
-+++ ./italc-1.0.9/acinclude.m4 2009-01-31 21:24:54.000000000 +0100
-@@ -127,9 +127,9 @@
- fi
- ;;
- *)
-- QT_LIBS=`ls $QTDIR/lib64/libQt*.so 2> /dev/null`
-+ QT_LIBS=`ls $QTDIR/lib64/qt4/libQt*.so 2> /dev/null`
- if test "x$QT_LIBS" = x; then
-- QT_LIBS=`ls $QTDIR/lib/libQt*.so 2> /dev/null`
-+ QT_LIBS=`ls $QTDIR/lib/qt4/libQt*.so 2> /dev/null`
- if test "x$QT_LIBS" = x; then
- AC_MSG_ERROR([*** Couldn't find any Qt4 libraries])
- fi
diff --git a/net-misc/italc/files/italc-1.0.9-strip.patch b/net-misc/italc/files/italc-1.0.9-strip.patch
deleted file mode 100644
index 831b9723930a..000000000000
--- a/net-misc/italc/files/italc-1.0.9-strip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./italc-1.0.9/Makefile.am 2008-07-23 13:25:55.000000000 +0200
-+++ ./italc-1.0.9/Makefile.am 2009-01-31 21:59:40.000000000 +0100
-@@ -10,13 +10,6 @@
- rm -rf `find $(distdir) -name *.moc`
- rm -rf `find $(distdir) -name *_qrc.cpp`
-
--# strip all binaries after installation
--install-exec-hook:
-- cd $(DESTDIR)$(bindir) ; \
-- strip ica; \
-- strip italc
--
--
- if HAVE_RPM
- $(PACKAGE)-$(VERSION).tar.gz: dist
-
diff --git a/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch b/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch
deleted file mode 100644
index c48441eaaa62..000000000000
--- a/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./italc-1.0.9.orig/ica/Makefile.am 2008-04-17 23:23:57.000000000 +0200
-+++ ./italc-1.0.9/ica/Makefile.am 2009-01-31 22:08:53.000000000 +0100
-@@ -6,47 +6,14 @@
- IVS_INCLUDES = -I$(srcdir)/x11 -I$(srcdir)/x11/x11vnc -I$(srcdir)/x11/libvncserver
-
- IVS_SRCS = $(srcdir)/x11/x11vnc.c \
-- $(srcdir)/x11/libvncserver/auth.c \
-- $(srcdir)/x11/libvncserver/cargs.c \
-- $(srcdir)/x11/libvncserver/corre.c \
-- $(srcdir)/x11/libvncserver/cursor.c \
-- $(srcdir)/x11/libvncserver/cutpaste.c \
-- $(srcdir)/x11/libvncserver/d3des.c \
-- $(srcdir)/x11/libvncserver/draw.c \
-- $(srcdir)/x11/libvncserver/font.c \
-- $(srcdir)/x11/libvncserver/hextile.c \
-- $(srcdir)/x11/libvncserver/httpd.c \
-- $(srcdir)/x11/libvncserver/main.c \
-- $(srcdir)/x11/libvncserver/rfbregion.c \
-- $(srcdir)/x11/libvncserver/rfbserver.c \
-- $(srcdir)/x11/libvncserver/rre.c \
-- $(srcdir)/x11/libvncserver/scale.c \
-- $(srcdir)/x11/libvncserver/selbox.c \
-- $(srcdir)/x11/libvncserver/sockets.c \
-- $(srcdir)/x11/libvncserver/stats.c \
-- $(srcdir)/x11/libvncserver/translate.c \
-- $(srcdir)/x11/libvncserver/ultra.c \
-- $(srcdir)/x11/libvncserver/vncauth.c \
- $(srcdir)/x11/rfb/rfbregion.h \
-- $(srcdir)/x11/rfb/default8x16.h \
-- $(srcdir)/x11/libvncserver/d3des.h \
-- $(srcdir)/x11/libvncserver/private.h \
-- $(srcdir)/x11/libvncserver/scale.h \
-- $(srcdir)/x11/libvncserver/zrleoutstream.h \
-- $(srcdir)/x11/libvncserver/zrlepalettehelper.h \
-- $(srcdir)/x11/libvncserver/zrletypes.h \
-- $(srcdir)/x11/libvncserver/zlib.c \
-- $(srcdir)/x11/libvncserver/zrle.c \
-- $(srcdir)/x11/libvncserver/zrleoutstream.c \
-- $(srcdir)/x11/libvncserver/zrlepalettehelper.c \
-- $(srcdir)/x11/libvncserver/tight.c
--
-+ $(srcdir)/x11/rfb/default8x16.h
-
- if HAVE_LIBPTHREAD
- PTHREADLDADD = -lpthread
- endif
-
--IVSLDADD = @X_LIBS@ $(PTHREADLDADD)
-+IVSLDADD = @X_LIBS@ $(PTHREADLDADD) -lvncserver
-
-
- else
diff --git a/net-misc/italc/italc-1.0.9.ebuild b/net-misc/italc/italc-1.0.9.ebuild
deleted file mode 100644
index 7898163404ee..000000000000
--- a/net-misc/italc/italc-1.0.9.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/italc-1.0.9.ebuild,v 1.11 2012/06/25 17:27:10 jlec Exp $
-
-EAPI=2
-
-inherit autotools eutils qt4-r2 user
-
-DESCRIPTION="Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school"
-HOMEPAGE="http://italc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/italc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="X v4l crypt xinerama threads fbcon system-libvncserver"
-
-RDEPEND="
- dev-libs/lzo
- dev-libs/openssl
- virtual/jpeg
- sys-apps/tcp-wrappers
- sys-libs/zlib
- x11-libs/qt-core:4
- x11-libs/qt-xmlpatterns:4
- system-libvncserver? ( net-libs/libvncserver )
- xinerama? ( x11-libs/libXinerama )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-apps/xinput
- x11-libs/qt-gui:4
- )"
-DEPEND="${RDEPEND}
- X? ( x11-proto/inputproto )"
-
-pkg_setup() {
- enewgroup italc
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-qt4-libpath.patch
- epatch "${FILESDIR}"/${P}-strip.patch
- use system-libvncserver && epatch "${FILESDIR}"/${P}-system-libvncserver.patch
- epatch "${FILESDIR}"/${P}-gcc44.patch
- epatch "${FILESDIR}"/${P}-as-needed.patch
- epatch "${FILESDIR}"/${P}-gcc45.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- "--with-qtdir=/usr" \
- "--with-linux" \
- "--with-uinput" \
- "--without-macosx-native" \
- $(use_with xinerama) \
- $(use_with X x) \
- $(use_with X xkeyboard) \
- $(use_with X xrandr) \
- $(use_with X xfixes) \
- $(use_with X xdamage) \
- $(use_with X xtrap) \
- $(use_with X xrecord) \
- $(use_with X dpms) \
- $(use_with v4l) \
- $(use_with fbcon fbdev) \
- $(use_with fbcon fbpm) \
- $(use_with threads pthread) \
- $(use_with crypt) \
- || die "econf failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
- rm -r "${D}/usr/share/italc"
- dodoc TODO README AUTHORS INSTALL ChangeLog
-
- # -- disabled per 2007-04-04 as the icon is missing in upstream file
- # -- joke
- # Install server logo
- #newicon ima/resources/client_manager.png ${PN}.png
- #make_desktop_entry ${PN} "iTALC Master" ${PN} "Qt;KDE;Education"
-}
-
-pkg_postinst() {
- elog "On the master, please run "
- elog "# emerge --config =${CATEGORY}/${PF}"
-
- elog "Please add the logins of master users (teachers) to the italc group by running"
- elog "# usermod -a -G italc <loginname>"
-
- elog ""
-}
-
-pkg_config() {
- if [ ! -d /etc/italc/keys ] ; then
- einfo "Creating public and private keys for italc in /etc/italc/keys."
- /usr/bin/ica -role teacher -createkeypair > /dev/null
- eend $?
- einfo "Setting chmod 640 on private keys."
- chgrp -R italc /etc/italc
- chmod -R o-rwx /etc/italc/keys/private
- else
- einfo "Not creating new keypair, as /etc/italc/keys already exists"
- fi
-}
diff --git a/net-misc/italc/metadata.xml b/net-misc/italc/metadata.xml
index 6771389ecf1b..91f4e72fb544 100644
--- a/net-misc/italc/metadata.xml
+++ b/net-misc/italc/metadata.xml
@@ -4,7 +4,4 @@
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
- <use>
- <flag name="system-libvncserver">Build against the system libvncserver (experimental)</flag>
- </use>
</pkgmetadata>