filtering --as-needed now, cleanup

(Portage version: 2.1.2.4)

6 files changed, 76 insertions, 120 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index 2c88ded10b9f..c720fa464a5d 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.47 2007/03/26 16:11:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.48 2007/04/28 21:52:22 mabi Exp $
+
+*ion3-20070318-r1 (28 Apr 2007)
+
+  28 Apr 2007; Matti Bickel <mabi@gentoo.org> -ion3-20060317.ebuild,
+  -ion3-20070203.ebuild, +ion3-20070318-r1.ebuild:
+  filtering --as-needed now, cleanup
 
   26 Mar 2007; Raúl Porcel <armin76@gentoo.org> ion3-20061223.ebuild,
   ion3-20070203.ebuild, ion3-20070318.ebuild:
diff --git a/x11-wm/ion3/files/digest-ion3-20060317 b/x11-wm/ion3/files/digest-ion3-20060317
deleted file mode 100644
index 1e1cd65bc054..000000000000
--- a/x11-wm/ion3/files/digest-ion3-20060317
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bed9ee5b45cbb46ee086c2b2ed2bf5d4 ion-3ds-20060317.tar.gz 613630
-RMD160 0be63bdc4aae60199b3f8d82c185866798246927 ion-3ds-20060317.tar.gz 613630
-SHA256 1519d7d587aa13e53dac22ead639b883c00fe79a3b8268da4869c44e10afc180 ion-3ds-20060317.tar.gz 613630
diff --git a/x11-wm/ion3/files/digest-ion3-20070203 b/x11-wm/ion3/files/digest-ion3-20070203
deleted file mode 100644
index f0accd1d5cf1..000000000000
--- a/x11-wm/ion3/files/digest-ion3-20070203
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 15b8f253c9a62b97a9881d431908da2a ion-3ds-20070203.tar.gz 644970
-RMD160 5a208900986c9fa62912754f8a35f245165fc7c0 ion-3ds-20070203.tar.gz 644970
-SHA256 950a2d27123d105d06d807b705c9ed5f6c93541976451078fbbb19c2150d8058 ion-3ds-20070203.tar.gz 644970
-MD5 454d6eb52c2c7c3622582a97e8e89184 ion3-mod-xrandr-20061021.tar.bz2 10762
-RMD160 cca3f472e32b8aff1ce8af123c24e17574c1b197 ion3-mod-xrandr-20061021.tar.bz2 10762
-SHA256 cd2225a356ddfc6f02062bf23c1e90fa573661347ff185316aeae0e18eee72ef ion3-mod-xrandr-20061021.tar.bz2 10762
-MD5 b10c58fcab7da993ad4fd769ead6989a ion3-scripts_20070203.orig.tar.gz 123859
-RMD160 bd5f0085fadc36e5875b505dee4aa08204bf2f2b ion3-scripts_20070203.orig.tar.gz 123859
-SHA256 869e5947f9b8663a701c4748245fdc4abd7225df27d2ca4418f9563af7c5643e ion3-scripts_20070203.orig.tar.gz 123859
diff --git a/x11-wm/ion3/files/digest-ion3-20070318-r1 b/x11-wm/ion3/files/digest-ion3-20070318-r1
new file mode 100644
index 000000000000..b233dc82b4c2
--- /dev/null
+++ b/x11-wm/ion3/files/digest-ion3-20070318-r1
@@ -0,0 +1,12 @@
+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/ion3-20060317.ebuild b/x11-wm/ion3/ion3-20060317.ebuild
deleted file mode 100644
index 8c706e353df9..000000000000
--- a/x11-wm/ion3/ion3-20060317.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20060317.ebuild,v 1.3 2006/12/27 01:02:04 mabi Exp $
-
-inherit eutils
-
-MY_PV=${PV/_p/-}
-MY_PN=ion-3ds-${MY_PV}
-DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind"
-HOMEPAGE="http://www.iki.fi/tuomov/ion/"
-SRC_URI="http://modeemi.cs.tut.fi/~tuomov/ion/dl/${MY_PN}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="iontruetype xinerama"
-DEPEND="
-	|| (
-		(
-			x11-libs/libICE
-			x11-libs/libXext
-			iontruetype? ( x11-libs/libXft )
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	app-misc/run-mailcap
-	=dev-lang/lua-5.0*"
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	use iontruetype && epatch ${FILESDIR}/${P}-truetype.patch
-}
-
-src_compile() {
-
-	autoreconf -i
-
-	local myconf=""
-
-	if has_version '>=x11-base/xfree-4.3.0'; then
-		myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
-	fi
-
-	use hppa && myconf="${myconf} --disable-shared"
-
-	econf \
-		--sysconfdir=/etc/X11 \
-		`use_enable iontruetype xft` \
-		`use_enable xinerama` \
-		${myconf} || die
-
-	make \
-		DOCDIR=/usr/share/doc/${PF} || die
-
-}
-
-src_install() {
-
-	make \
-		prefix=${D}/usr \
-		ETCDIR=${D}/etc/X11/ion3 \
-		SHAREDIR=${D}/usr/share/ion3 \
-		MANDIR=${D}/usr/share/man \
-		DOCDIR=${D}/usr/share/doc/${PF} \
-		LOCALEDIR=${D}/usr/share/locale \
-		LIBDIR=${D}/usr/lib \
-		MODULEDIR=${D}/usr/lib/ion3/mod \
-		LCDIR=${D}/usr/lib/ion3/lc \
-		VARDIR=${D}/var/cache/ion3 \
-		install || die
-
-	prepalldocs
-
-	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
-
-}
diff --git a/x11-wm/ion3/ion3-20070203.ebuild b/x11-wm/ion3/ion3-20070318-r1.ebuild
index ea34741be088..1605e04da4c3 100644
--- a/x11-wm/ion3/ion3-20070203.ebuild
+++ b/x11-wm/ion3/ion3-20070318-r1.ebuild
@@ -1,40 +1,52 @@
 # 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-20070203.ebuild,v 1.2 2007/03/26 16:11:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070318-r1.ebuild,v 1.1 2007/04/28 21:52:22 mabi Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 MY_PV=${PV/_p/-}
 MY_PN=ion-3ds-${MY_PV}
 
-SCRIPTS_PV=20070203
+SCRIPTS_PV=20070322
 SCRIPTS_PN=ion3-scripts
 
-IONXRANDR_PV=20061021
+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://debian/pool/main/i/${SCRIPTS_PN}/${SCRIPTS_PN}_${SCRIPTS_PV}.orig.tar.gz
-	mirror://gentoo/${IONXRANDR_PN}-${IONXRANDR_PV}.tar.bz2"
+	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"
+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"
+	>=dev-lang/lua-5.1.1
+	doc? ( dev-tex/latex2html
+			virtual/tetex )"
+
 S=${WORKDIR}/${MY_PN}
 
 SCRIPTS_DIRS="keybindings scripts statusbar statusd styles"
@@ -45,16 +57,17 @@ src_unpack() {
 
 	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 Makefile */Makefile */*/Makefile build/rules.mk \
-		-e 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g'
+	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 \
+		sed -i Makefile */Makefile \
 			-e 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g'
 
 	done
@@ -65,6 +78,14 @@ src_unpack() {
 	# 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
 
@@ -76,7 +97,11 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 
-	# xfree
+	filter-ldflags "-Wl,--as-needed"
+
+	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
@@ -90,7 +115,7 @@ src_compile() {
 	cd build/ac/
 	econf \
 		${myconf} \
-		--sysconfdir=/etc/X11
+		--sysconfdir=/etc/X11 \
 
 	cd ${S}
 	make \
@@ -112,16 +137,22 @@ src_compile() {
 		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
 
-	prepalldocs
-
 	echo -e "#!/bin/sh\n/usr/bin/ion3" > ${T}/ion3
 	echo -e "#!/bin/sh\n/usr/bin/pwm3" > ${T}/pwm3
 	exeinto /etc/X11/Sessions
@@ -133,11 +164,13 @@ src_install() {
 	cd ${WORKDIR}/${SCRIPTS_PN}-${SCRIPTS_PV}
 	insinto /usr/share/ion3
 	find $SCRIPTS_DIRS -type f |\
-		while read FILE ; do
+		while read FILE
+		do
 			doins $PWD/$FILE
 		done
 
-	for i in ${MODULES} ; do
+	for i in ${MODULES}
+	do
 		cd ${WORKDIR}/${i}
 
 		emake \
@@ -146,15 +179,15 @@ src_install() {
 
 	done
 
-	echo 'dopath("mod_xrandr")' >> ${D}/etc/X11/ion3/cfg_modules.lua
+	if ( use doc )
+	then
+		cd ${WORKDIR}/${IONDOC_PN}-${IONDOC_PV}
+		dodoc *.pdf
+	fi
 
-	mv ${D}/usr/share/doc/ion3 ${D}/usr/share/doc/${PF}
+	sed -i -e '/dopath("mod_sp")/a\dopath("mod_xrandr")' ${D}/etc/X11/ion3/cfg_defaults.lua
 }
 
 pkg_postinst() {
-	elog "Please note that this release does *not* include xinerama support
-	anymore."
-	elog "Support for that feature has been dropped upstream."
-	elog "Also, xft (via iontruetype) is gone, in a bid to close the gap to
-	upstream."
+	elog "This version of ion3 contains no xinerama support (removed upstream)."
 }