remove old

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

6 files changed, 6 insertions, 157 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index adc156eada26..1710612f6661 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.95 2013/02/06 14:38:01 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.96 2013/02/06 14:51:02 axs Exp $
+
+  06 Feb 2013; Ian Stakenvicius <axs@gentoo.org> -slim-1.3.4-r2.ebuild,
+  -files/slim-1.3.4-arm.patch, -files/slim-1.3.4-libpng.patch,
+  -files/slim-1.3.4-pam-end.patch, -files/slim.service:
+  remove old
 
 *slim-1.3.5-r1 (06 Feb 2013)
 
diff --git a/x11-misc/slim/files/slim-1.3.4-arm.patch b/x11-misc/slim/files/slim-1.3.4-arm.patch
deleted file mode 100644
index 30baf6bd5365..000000000000
--- a/x11-misc/slim/files/slim-1.3.4-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Ck.cpp	2012-06-26 04:20:14.000000000 -0400
-+++ b/Ck.cpp	2012-10-05 13:25:29.000000000 -0400
-@@ -91,7 +91,7 @@
- 
-     vt = *((long *)return_value);
- 
--    std::snprintf(device, 32, "/dev/tty%ld", vt);
-+    std::sprintf(device, "/dev/tty%ld", vt);
- 
-     if(return_value)
-       XFree(return_value);
diff --git a/x11-misc/slim/files/slim-1.3.4-libpng.patch b/x11-misc/slim/files/slim-1.3.4-libpng.patch
deleted file mode 100644
index 57b39272b620..000000000000
--- a/x11-misc/slim/files/slim-1.3.4-libpng.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
-                                 (png_infopp) NULL);
-     }
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
-     if (setjmp(png_ptr->jmpbuf)) {
-+#endif
-         goto png_destroy;
-     }
- 
diff --git a/x11-misc/slim/files/slim-1.3.4-pam-end.patch b/x11-misc/slim/files/slim-1.3.4-pam-end.patch
deleted file mode 100644
index c3668c39e867..000000000000
--- a/x11-misc/slim/files/slim-1.3.4-pam-end.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/app.cpp	2012-10-05 12:31:24.000000000 -0400
-+++ b/app.cpp	2012-10-05 12:32:02.000000000 -0400
-@@ -599,7 +599,6 @@
-         child_env[n] = NULL;
- # endif /* USE_CONSOLEKIT */
- 
--        pam.end();
- #else
- 
- # ifdef USE_CONSOLEKIT
diff --git a/x11-misc/slim/files/slim.service b/x11-misc/slim/files/slim.service
deleted file mode 100644
index b894085a0aa0..000000000000
--- a/x11-misc/slim/files/slim.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/x11-misc/slim/slim-1.3.4-r2.ebuild b/x11-misc/slim/slim-1.3.4-r2.ebuild
deleted file mode 100644
index 8a70e677e0d8..000000000000
--- a/x11-misc/slim/slim-1.3.4-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.4-r2.ebuild,v 1.1 2012/12/29 19:01:30 xarthisius Exp $
-
-EAPI=4
-
-CMAKE_MIN_VERSION="2.8.8"
-inherit cmake-utils pam eutils systemd versionator
-
-DESCRIPTION="Simple Login Manager"
-HOMEPAGE="http://slim.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	media-libs/libpng
-	virtual/jpeg
-	x11-apps/sessreg
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-src_prepare() {
-	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${P}-config.diff
-	epatch "${FILESDIR}"/${P}-libpng.patch
-	epatch "${FILESDIR}"/${P}-pam-end.patch
-	epatch "${FILESDIR}"/${P}-arm.patch
-
-	if use elibc_FreeBSD; then
-		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
-			|| die
-	fi
-
-	if use branding; then
-		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use pam USE_PAM)
-		$(cmake-utils_use consolekit USE_CONSOLEKIT)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use pam ; then
-		pamd_mimic system-local-login slim auth account session
-	fi
-
-	insinto /usr/share/slim
-	newins "${FILESDIR}/Xsession-r3" Xsession
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/slim.logrotate" slim
-
-	dodoc xinitrc.sample ChangeLog README TODO THEMES
-	systemd_dounit "${FILESDIR}"/${PN}.service || die
-}
-
-pkg_postinst() {
-	# note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "The configuration file is located at /etc/slim.conf."
-		elog
-		elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
-		elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
-	fi
-	if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
-		elog
-		elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
-		elog "support, as well as selection between sessions available in"
-		elog "/etc/X11/Sessions/ at login by pressing [F1]."
-		elog
-		elog "The XSESSION environment variable is still supported as a default"
-		elog "if no session has been specified by the user."
-		elog
-		elog "If you want to use .xinitrc in the user's home directory for session"
-		elog "management instead, see README and xinitrc.sample in"
-		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
-		elog "accordingly."
-		elog
-		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
-		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
-		ewarn "and enable USE=\"consolekit\" instead."
-		ewarn
-	fi
-	if ! use pam; then
-		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
-		elog "the console when restarting your window manager. If this is not desired, then"
-		elog "please remerge ${PN} with USE=\"pam\""
-		elog
-	fi
-}