Fix LICENSE by Ulrich Müller (bug #446766).

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 7 insertions, 47 deletions

diff --git a/x11-misc/tabbed/ChangeLog b/x11-misc/tabbed/ChangeLog
index 3a8667593134..d5333af2cbaa 100644
--- a/x11-misc/tabbed/ChangeLog
+++ b/x11-misc/tabbed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/tabbed
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/tabbed/ChangeLog,v 1.4 2012/08/25 15:36:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tabbed/ChangeLog,v 1.5 2012/12/10 19:01:34 jer Exp $
+
+  10 Dec 2012; Jeroen Roovers <jer@gentoo.org> -tabbed-0.4.ebuild,
+  tabbed-0.4.1.ebuild:
+  Fix LICENSE by Ulrich Müller (bug #446766).
 
   25 Aug 2012; Jeroen Roovers <jer@gentoo.org> -tabbed-0.3.ebuild,
   tabbed-0.4.1.ebuild:
diff --git a/x11-misc/tabbed/tabbed-0.4.1.ebuild b/x11-misc/tabbed/tabbed-0.4.1.ebuild
index c7917d4891a0..726368fa3457 100644
--- a/x11-misc/tabbed/tabbed-0.4.1.ebuild
+++ b/x11-misc/tabbed/tabbed-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/tabbed/tabbed-0.4.1.ebuild,v 1.2 2012/08/25 15:36:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tabbed/tabbed-0.4.1.ebuild,v 1.3 2012/12/10 19:01:34 jer Exp $
 
 EAPI=4
 inherit savedconfig toolchain-funcs
@@ -9,7 +9,7 @@ DESCRIPTION="Simple generic tabbed fronted to xembed aware applications"
 HOMEPAGE="http://tools.suckless.org/tabbed"
 SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/x11-misc/tabbed/tabbed-0.4.ebuild b/x11-misc/tabbed/tabbed-0.4.ebuild
deleted file mode 100644
index c2b53a42fe22..000000000000
--- a/x11-misc/tabbed/tabbed-0.4.ebuild
+++ /dev/null
@@ -1,44 +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/tabbed/tabbed-0.4.ebuild,v 1.1 2012/07/18 17:11:43 jer Exp $
-
-EAPI="3"
-
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Simple generic tabbed fronted to xembed aware applications"
-HOMEPAGE="http://tools.suckless.org/tabbed"
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="
-	x11-proto/xproto
-	${RDEPEND}
-"
-
-src_prepare() {
-	sed \
-		-e 's|/usr/local|/usr|g' \
-		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \
-		-e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \
-		-e 's|^LIBS.*|LIBS = -lX11|g' \
-		-e '/^CC/d' \
-		-i config.mk || die
-	sed \
-		-e 's|{|(|g;s|}|)|g' \
-		-i Makefile config.mk || die
-	restore_config config.h
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake compile failed"
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	save_config config.h
-}