321fix get_libdir use, fix license, cleanup

(Portage version: 2.1.2.9)

5 files changed, 12 insertions, 209 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index 8a068246eace..e064f302dd04 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ion3
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.50 2007/05/31 09:42:57 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.51 2007/06/01 22:55:01 mabi Exp $
+
+*ion3-20070506-r1 (01 Jun 2007)
+
+  01 Jun 2007; Matti Bickel <mabi@gentoo.org> -ion3-20070318.ebuild,
+  -ion3-20070506.ebuild, +ion3-20070506-r1.ebuild:
+  fix retarded use of $(get_libdir), fix LICENSE
 
 *ion3-20070506 (12 May 2007)
 
diff --git a/x11-wm/ion3/files/digest-ion3-20070318 b/x11-wm/ion3/files/digest-ion3-20070318
deleted file mode 100644
index b233dc82b4c2..000000000000
--- a/x11-wm/ion3/files/digest-ion3-20070318
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 f02264ab7ecc990c2cd322f57a5e8a4d ion-3ds-20070318.tar.gz 657282
-RMD160 a7cc9baea3624b0ed840fdc82fc5db2ac1018d9a ion-3ds-20070318.tar.gz 657282
-SHA256 712da027fb12774f67d933d95a95452d98a5658617fc5515011ca79b6035258a ion-3ds-20070318.tar.gz 657282
-MD5 b6ec641eac93eb32a97de4baf02f4da0 ion3-doc-20070318.tar.bz2 38870
-RMD160 5fc0225ad23f1c96b5e979d66185ea608372297d ion3-doc-20070318.tar.bz2 38870
-SHA256 22ca643ca5df67086f12d3f106b16094017477c41fd1ebd73d30607db206821b ion3-doc-20070318.tar.bz2 38870
-MD5 4ce492ba5311d74328655923386868ee ion3-mod-xrandr-20070220.tar.bz2 10822
-RMD160 680714961af7e6b81896c4d989baded5ea4c5222 ion3-mod-xrandr-20070220.tar.bz2 10822
-SHA256 858a72ad203fb98f3cea672809a2cdfd7cb87cfa744e622e5a04d2f87cc1ae38 ion3-mod-xrandr-20070220.tar.bz2 10822
-MD5 47c6573679eead6183c49bdbc660aedd ion3-scripts-20070322.tar.bz2 101212
-RMD160 101a6dd933b5b9b495ca4607a7e0d48d48a9c409 ion3-scripts-20070322.tar.bz2 101212
-SHA256 6864d75f2f7ca021368b52051c297f5590047257ca39d0332af65c7fef0f8d39 ion3-scripts-20070322.tar.bz2 101212
diff --git a/x11-wm/ion3/files/digest-ion3-20070506 b/x11-wm/ion3/files/digest-ion3-20070506-r1
index bfefeec9b528..bfefeec9b528 100644
--- a/x11-wm/ion3/files/digest-ion3-20070506
+++ b/x11-wm/ion3/files/digest-ion3-20070506-r1
diff --git a/x11-wm/ion3/ion3-20070318.ebuild b/x11-wm/ion3/ion3-20070318.ebuild
deleted file mode 100644
index dacaaafc48ba..000000000000
--- a/x11-wm/ion3/ion3-20070318.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070318.ebuild,v 1.2 2007/03/26 16:11:50 armin76 Exp $
-
-inherit eutils
-
-MY_PV=${PV/_p/-}
-MY_PN=ion-3ds-${MY_PV}
-
-SCRIPTS_PV=20070322
-SCRIPTS_PN=ion3-scripts
-
-IONFLUX_PV=20061022
-IONFLUX_PN=ion3-mod-ionflux
-
-IONXRANDR_PV=20070220
-IONXRANDR_PN=ion3-mod-xrandr
-
-IONDOC_PV=20070318
-IONDOC_PN=ion3-doc
-
-
-DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind"
-HOMEPAGE="http://www.iki.fi/tuomov/ion/"
-SRC_URI="http://iki.fi/tuomov/dl/${MY_PN}.tar.gz
-	mirror://gentoo/${SCRIPTS_PN}-${SCRIPTS_PV}.tar.bz2
-	mirror://gentoo/${IONXRANDR_PN}-${IONXRANDR_PV}.tar.bz2
-	doc?	( mirror://gentoo/${IONDOC_PN}-${IONDOC_PV}.tar.bz2 )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="unicode iontruetype doc"
-DEPEND="
-	|| (
-		(
-			x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			iontruetype? ( x11-libs/libXft )
-		)
-		virtual/x11
-	)
-	dev-util/pkgconfig
-	app-misc/run-mailcap
-	>=dev-lang/lua-5.1.1
-	doc? ( dev-tex/latex2html
-			virtual/tetex )"
-
-S=${WORKDIR}/${MY_PN}
-
-SCRIPTS_DIRS="keybindings scripts statusbar statusd styles"
-MODULES="${IONXRANDR_PN}-${IONXRANDR_PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" epatch
-	use iontruetype && epatch ${FILESDIR}/xft-ion3-${PV}.patch
-
-
-	# Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox
-	sed -i 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g' Makefile */Makefile */*/Makefile build/rules.mk
-
-	for i in ${MODULES}
-	do
-		cd ${WORKDIR}/${i}
-		# Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox
-		sed -i Makefile */Makefile \
-			-e 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g'
-
-	done
-	cd ${S}
-
-	# Hey guys! Implicit rules apply to include statements also. Be more careful!
-	# Fix an implicit rule that will kill the installation by rewriting a .mk
-	# should configure be given just the right set of options.
-	sed -i 's!%: %.in!ion-completeman: %: %.in!g' utils/Makefile
-
-	# Fix prestripping of files
-	sed -i mod_statusbar/ion-statusd/Makefile utils/ion-completefile/Makefile \
-		-e 's: -s::'
-
-	# Fix the docpath
-	#sed -i system.mk build/ac/system-ac.mk.in \
-	#	-e "s:\(DOCDIR=@datadir@/doc/\)@PACKAGE_TARNAME@:\1${PF}:"
-
-	cd ${S}/build/ac/
-	autoreconf -i --force
-
-	# FIX for modules
-	cd ${WORKDIR}
-	ln -s ${MY_PN} ion-3
-}
-
-src_compile() {
-	local myconf=""
-
-	myconf="${myconf} `use_enable iontruetype xft`"
-
-	# xfree 
-	if has_version '>=x11-base/xfree-4.3.0'; then
-		myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
-	fi
-
-	# help out this arch as it can't handle certain shared library linkage
-	use hppa && myconf="${myconf} --disable-shared"
-
-	# unicode support
-	use unicode && myconf="${myconf} --enable-Xutf8"
-
-	cd build/ac/
-	econf \
-		${myconf} \
-		--sysconfdir=/etc/X11 \
-
-	cd ${S}
-	make \
-		DOCDIR=/usr/share/doc/${PF} || die
-
-	for i in ${MODULES}
-	do
-	cd ${WORKDIR}/${i}
-
-	emake \
-		prefix=/usr \
-		ETCDIR=/etc/X11/ion3 \
-		SHAREDIR=/usr/share/ion3 \
-		MANDIR=/usr/share/man \
-		DOCDIR=/usr/share/doc/${PF} \
-		LOCALEDIR=/usr/share/locale \
-		LIBDIR=/usr/lib \
-		MODULEDIR=/usr/lib/ion3/mod \
-		LCDIR=/usr/lib/ion3/lc \
-		VARDIR=/var/cache/ion3
-	done
-
-	if ( use doc )
-	then
-		cd ${WORKDIR}/${IONDOC_PN}-${IONDOC_PV}
-		make all
-		make all-pdf
-	fi
-}
-
-src_install() {
-
-	emake \
-		DESTDIR=${D} \
-		DOCDIR=/usr/share/doc/${PF} \
-	install || die
-
-	echo -e "#!/bin/sh\n/usr/bin/ion3" > ${T}/ion3
-	echo -e "#!/bin/sh\n/usr/bin/pwm3" > ${T}/pwm3
-	exeinto /etc/X11/Sessions
-	doexe ${T}/ion3 ${T}/pwm3
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/ion3.desktop ${FILESDIR}/pwm3.desktop
-
-	cd ${WORKDIR}/${SCRIPTS_PN}-${SCRIPTS_PV}
-	insinto /usr/share/ion3
-	find $SCRIPTS_DIRS -type f |\
-		while read FILE
-		do
-			doins $PWD/$FILE
-		done
-
-	for i in ${MODULES}
-	do
-		cd ${WORKDIR}/${i}
-
-		emake \
-			DESTDIR=${D} \
-			install || die
-
-	done
-
-	if ( use doc )
-	then
-		cd ${WORKDIR}/${IONDOC_PN}-${IONDOC_PV}
-		dodoc *.pdf
-	fi
-
-	sed -i -e '/dopath("mod_sp")/a\dopath("mod_xrandr")' ${D}/etc/X11/ion3/cfg_defaults.lua
-}
-
-pkg_postinst() {
-	elog "This version of ion3 contains no xinerama support (removed upstream)."
-}
diff --git a/x11-wm/ion3/ion3-20070506.ebuild b/x11-wm/ion3/ion3-20070506-r1.ebuild
index dda9484a2eab..2ac50a62ea23 100644
--- a/x11-wm/ion3/ion3-20070506.ebuild
+++ b/x11-wm/ion3/ion3-20070506-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070506.ebuild,v 1.1 2007/05/31 09:42:57 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070506-r1.ebuild,v 1.1 2007/06/01 22:55:01 mabi Exp $
 
 inherit eutils flag-o-matic
 
@@ -27,7 +27,7 @@ SRC_URI="http://iki.fi/tuomov/dl/${MY_PN}.tar.gz
 	mirror://gentoo/${IONFLUX_PN}-${IONFLUX_PV}.tar.bz2
 	doc?	( http://iki.fi/tuomov/dl/${IONDOC_PN}-${IONDOC_PV}.tar.gz )"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+tuomov"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="unicode voidsupport-truetype doc"
@@ -116,15 +116,15 @@ src_compile() {
 
 	cd ${S}
 	make \
-		LIBDIR=$(get_libdir) \
+		LIBDIR=/usr/$(get_libdir) \
 		DOCDIR=/usr/share/doc/${PF} || die
 
 	for i in ${MODULES}
 	do
 		cd ${WORKDIR}/${i}
 
-		emake \
-		LIBDIR=$(get_libdir)
+		make \
+			LIBDIR=/usr/$(get_libdir)
 	done
 
 	if ( use doc )