Sync with portage [Wed Sep 5 23:41:59 MSK 2012].

app-backup/bacula/bacula-5.0.3-r1.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/app-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.11 2012/05/24 04:36:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.13 2012/09/05 08:28:17 jlec Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -222,16 +222,13 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png || die
+	doicon scripts/bacula.png || die
 
 	# install bat when enabled (for some reason ./configure doesn't pick this up)
 	if use qt4; then
 		dosbin "${S}"/src/qt-console/.libs/bat || die
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png || die
-		insinto /usr/share/applications
-		doins scripts/bat.desktop || die
+		doicon src/qt-console/images/bat_icon.png || die
+		domenu scripts/bat.desktop || die
 	fi
 
 	# remove some scripts we don't need at all

app-backup/bacula/bacula-5.0.3-r2.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/app-backup/bacula/bacula-5.0.3-r2.ebuild,v 1.8 2012/05/24 04:36:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild,v 1.10 2012/09/05 08:28:17 jlec Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -236,16 +236,13 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png || die
+	doicon scripts/bacula.png || die
 
 	# install bat when enabled (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
 		dosbin "${S}"/src/qt-console/.libs/bat || die
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png || die
-		insinto /usr/share/applications
-		doins scripts/bat.desktop || die
+		doicon src/qt-console/images/bat_icon.png || die
+		domenu scripts/bat.desktop || die
 	fi
 
 	# remove some scripts we don't need at all

app-backup/bacula/bacula-5.0.3-r3.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/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.5 2012/05/24 04:36:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.8 2012/09/05 08:29:58 jlec Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -238,16 +238,13 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png || die
+	doicon scripts/bacula.png || die
 
 	# install bat when enabled (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
 		dosbin "${S}"/src/qt-console/.libs/bat || die
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png || die
-		insinto /usr/share/applications
-		doins scripts/bat.desktop || die
+		doicon src/qt-console/images/bat_icon.png || die
+		domenu scripts/bat.desktop || die
 	fi
 
 	# remove some scripts we don't need at all
@@ -320,7 +317,7 @@ src_install() {
 	fi
 
 	# documentation
-	dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
+	dodoc ChangeLog ReleaseNotes SUPPORT technotes
 
 	# vim-files
 	if use vim-syntax; then

app-backup/bacula/bacula-5.2.10.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/app-backup/bacula/bacula-5.2.10.ebuild,v 1.2 2012/08/17 18:14:02 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.10.ebuild,v 1.5 2012/09/05 08:29:58 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -195,16 +195,13 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png
+	doicon scripts/bacula.png
 
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png
-		insinto /usr/share/applications
-		doins scripts/bat.desktop
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
 	fi
 
 	# remove some scripts we don't need at all
@@ -277,7 +274,7 @@ src_install() {
 	fi
 
 	# documentation
-	dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
+	dodoc ChangeLog ReleaseNotes SUPPORT technotes
 
 	# vim-files
 	if use vim-syntax; then

app-backup/bacula/bacula-5.2.5.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/app-backup/bacula/bacula-5.2.5.ebuild,v 1.9 2012/08/17 18:14:02 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v 1.12 2012/09/05 08:29:58 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -195,16 +195,13 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png
+	doicon scripts/bacula.png
 
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png
-		insinto /usr/share/applications
-		doins scripts/bat.desktop
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
 	fi
 
 	# remove some scripts we don't need at all
@@ -277,7 +274,7 @@ src_install() {
 	fi
 
 	# documentation
-	dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
+	dodoc ChangeLog ReleaseNotes SUPPORT technotes
 
 	# vim-files
 	if use vim-syntax; then

app-backup/bacula/bacula-5.2.9.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/app-backup/bacula/bacula-5.2.9.ebuild,v 1.3 2012/08/17 18:14:02 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.6 2012/09/05 08:29:58 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -194,16 +194,13 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png
+	doicon scripts/bacula.png
 
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png
-		insinto /usr/share/applications
-		doins scripts/bat.desktop
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
 	fi
 
 	# remove some scripts we don't need at all
@@ -276,7 +273,7 @@ src_install() {
 	fi
 
 	# documentation
-	dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
+	dodoc ChangeLog ReleaseNotes SUPPORT technotes
 
 	# vim-files
 	if use vim-syntax; then

app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild,v 1.9 2012/05/03 07:51:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild,v 1.10 2012/09/05 18:26:29 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
@@ -17,22 +17,28 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="gcdmaster encode pccts mad vorbis"
+IUSE="gcdmaster encode mad vorbis"
 
 RDEPEND="virtual/cdrtools
-	encode? ( >=media-sound/lame-3.90 )
-	gcdmaster? ( dev-libs/libsigc++:2
+	encode? ( >=media-sound/lame-3.99 )
+	gcdmaster? (
+		dev-libs/libsigc++:2
 		>=dev-cpp/gtkmm-2.4:2.4
 		>=dev-cpp/libgnomeuimm-2.6:2.6
-		media-libs/libao )
-	mad? ( media-libs/libmad
-		media-libs/libao )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libao )
-	!app-cdr/cue2toc"
+		media-libs/libao
+		)
+	mad? (
+		media-libs/libmad
+		media-libs/libao
+		)
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libao
+		)
+	!app-cdr/cue2toc
+	!dev-util/pccts"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	pccts? ( >=dev-util/pccts-1.33.24-r1 )"
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${P/_}
 
@@ -42,7 +48,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_with gcdmaster xdao) \
 		$(use_with vorbis ogg-support) \
 		$(use_with mad mp3-support) \
@@ -50,6 +55,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog CREDITS NEWS README{,.PlexDAE}
 }

app-cdr/cdrdao/metadata.xml

@@ -8,7 +8,5 @@
 </longdescription>
 <use>
 	<flag name='gcdmaster'>Enable building of gcdmaster application</flag>
-	<flag name='pccts'>Use <pkg>dev-util/pccts</pkg> instead of the built-in
-		substitution</flag>
 </use>
 </pkgmetadata>

app-cdr/tkdvd/tkdvd-4.0.7.ebuild

@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.7.ebuild,v 1.3 2008/02/15 21:03:04 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.7.ebuild,v 1.4 2012/09/05 08:36:57 jlec Exp $
+
+inherit eutils
 
 DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs"
 HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/"
@@ -31,16 +33,15 @@ src_install() {
 
 	dodir /usr/bin
 
-	cat <<EOF >"${D}"/usr/bin/tkdvd
-#!/bin/sh
-cd /usr/share/${PF}
-./TkDVD.sh
-EOF
+	cat <<- EOF >"${D}"/usr/bin/tkdvd
+	#!/bin/sh
+	cd /usr/share/${PF}
+	./TkDVD.sh
+	EOF
 
 	fperms 755 /usr/bin/tkdvd
 
 	dodoc ChangeLog FAQ INSTALL README TODO doc/config_file
 
-	insinto /usr/share/pixmaps
-	doins icons/*.png
+	doicon icons/*.png
 }

app-cdr/tkdvd/tkdvd-4.0.8.ebuild

@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.8.ebuild,v 1.1 2008/06/15 17:33:46 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.8.ebuild,v 1.2 2012/09/05 08:36:57 jlec Exp $
+
+inherit eutils
 
 DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs"
 HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/"
@@ -29,17 +31,16 @@ src_install() {
 
 	dodir /usr/bin
 
-	cat <<EOF >"${D}"/usr/bin/tkdvd
-#!/bin/sh
-cd /usr/share/${PF}
-./TkDVD.sh
-EOF
+	cat <<- EOF >"${D}"/usr/bin/tkdvd
+	#!/bin/sh
+	cd /usr/share/${PF}
+	./TkDVD.sh
+	EOF
 
 	fperms 755 /usr/bin/tkdvd
 
 	dodoc ChangeLog FAQ README TODO doc/config_file
 	dohtml doc/combobox.html
 
-	insinto /usr/share/pixmaps
-	doins icons/*.png
+	doicon icons/*.png
 }

app-cdr/tkdvd/tkdvd-4.0.9.ebuild

@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.9.ebuild,v 1.1 2009/04/26 20:15:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.9.ebuild,v 1.2 2012/09/05 08:36:57 jlec Exp $
+
+inherit eutils
 
 DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs"
 HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/"
@@ -29,17 +31,16 @@ src_install() {
 
 	dodir /usr/bin
 
-	cat <<EOF >"${D}"/usr/bin/tkdvd
-#!/bin/sh
-cd /usr/share/${PF}
-./TkDVD.sh
-EOF
+	cat <<- EOF >"${D}"/usr/bin/tkdvd
+	#!/bin/sh
+	cd /usr/share/${PF}
+	./TkDVD.sh
+	EOF
 
 	fperms 755 /usr/bin/tkdvd
 
 	dodoc ChangeLog FAQ README TODO doc/config_file
 	dohtml doc/combobox.html
 
-	insinto /usr/share/pixmaps
-	doins icons/*.png
+	doicon icons/*.png
 }

app-editors/editra/editra-0.7.08.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/app-editors/editra/editra-0.7.08.ebuild,v 1.2 2012/09/03 00:24:27 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.7.08.ebuild,v 1.3 2012/09/05 08:40:44 jlec Exp $
 
 EAPI=2
 SUPPORT_PYTHON_ABIS=1
@@ -34,8 +34,7 @@ src_compile() {
 
 src_install() {
 	distutils_src_install --no-clean
-	insinto /usr/share/pixmaps
-	doins "${S}"/pixmaps/editra.png
+	doicon "${S}"/pixmaps/editra.png
 	make_desktop_entry editra Editra editra "Utility;TextEditor"
 	dodoc FAQ THANKS
 }

app-editors/editra/editra-0.7.12.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/app-editors/editra/editra-0.7.12.ebuild,v 1.1 2012/09/03 00:24:27 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.7.12.ebuild,v 1.2 2012/09/05 08:40:44 jlec Exp $
 
 EAPI=2
 SUPPORT_PYTHON_ABIS=1
@@ -34,8 +34,7 @@ src_compile() {
 
 src_install() {
 	distutils_src_install --no-clean
-	insinto /usr/share/pixmaps
-	doins "${S}"/pixmaps/editra.png
+	doicon "${S}"/pixmaps/editra.png
 	make_desktop_entry editra Editra editra "Utility;TextEditor"
 	dodoc FAQ THANKS
 }

app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.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/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild,v 1.4 2012/05/29 19:15:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild,v 1.5 2012/09/05 07:09:11 jlec Exp $
 
 EAPI=4
 
@@ -74,8 +74,7 @@ src_install() {
 		insinto /usr/share
 		doins -r "${WORKDIR}/jasspa"
 		if use X; then
-			insinto /usr/share/applications
-			doins "${FILESDIR}/${PN}.desktop"
+			domenu "${FILESDIR}/${PN}.desktop"
 		fi
 	fi
 

app-editors/scite/scite-3.1.0.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/app-editors/scite/scite-3.1.0.ebuild,v 1.6 2012/08/05 21:58:58 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.1.0.ebuild,v 1.7 2012/09/05 07:10:16 jlec Exp $
 
 EAPI="4"
 
@@ -80,8 +80,7 @@ src_install() {
 
 	# replace .desktop file with our own working version
 	rm -f "${ED}/usr/share/applications/SciTE.desktop"
-	insinto /usr/share/applications
-	doins "${FILESDIR}/scite.desktop"
+	domenu "${FILESDIR}/scite.desktop"
 
 	doman ../doc/scite.1
 	dodoc ../README

app-editors/xemacs/xemacs-21.4.22-r2.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/app-editors/xemacs/xemacs-21.4.22-r2.ebuild,v 1.13 2012/03/18 12:58:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.22-r2.ebuild,v 1.15 2012/09/05 08:48:48 jlec Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -229,11 +229,9 @@ src_install() {
 	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
 	dodoc "${FILESDIR}"/README.Gentoo
 
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
+	domenu "${FILESDIR}"/${PN}.desktop
 }
 
 pkg_postinst() {

app-editors/xemacs/xemacs-21.5.29-r2.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/app-editors/xemacs/xemacs-21.5.29-r2.ebuild,v 1.10 2012/03/18 12:58:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.29-r2.ebuild,v 1.12 2012/09/05 08:48:48 jlec Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -224,11 +224,9 @@ src_install() {
 	cd "${S}"
 	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
 
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
+	domenu "${FILESDIR}"/${PN}.desktop
 }
 
 pkg_postinst() {

app-editors/xemacs/xemacs-21.5.30.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/app-editors/xemacs/xemacs-21.5.30.ebuild,v 1.3 2012/03/18 12:58:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.30.ebuild,v 1.5 2012/09/05 08:48:48 jlec Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -216,11 +216,9 @@ src_install() {
 	cd "${S}"
 	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
 
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
+	domenu "${FILESDIR}"/${PN}.desktop
 }
 
 pkg_postinst() {

app-editors/xemacs/xemacs-21.5.31.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/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.8 2012/06/02 14:12:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.10 2012/09/05 08:48:48 jlec Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -213,11 +213,9 @@ src_install() {
 	cd "${S}"
 	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
 
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
+	domenu "${FILESDIR}"/${PN}.desktop
 }
 
 pkg_postinst() {

app-emulation/virtualbox/virtualbox-4.1.12.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/app-emulation/virtualbox/virtualbox-4.1.12.ebuild,v 1.7 2012/08/22 21:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild,v 1.8 2012/09/05 09:16:52 jlec Exp $
 
 EAPI=4
 
@@ -300,12 +300,10 @@ src_install() {
 		fi
 
 		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 20 32 40 48 64 128 ; do
-			insinto /usr/share/icons/hicolor/${size}x${size}/apps
-			newins ${PN}-${size}px.png ${PN}.png
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
 		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
+		newicon ${PN}-48px.png ${PN}.png
 		popd &>/dev/null || die
 	else
 		doins VBoxHeadless || die

app-emulation/virtualbox/virtualbox-4.1.18.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/app-emulation/virtualbox/virtualbox-4.1.18.ebuild,v 1.4 2012/08/22 21:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.18.ebuild,v 1.5 2012/09/05 09:16:52 jlec Exp $
 
 EAPI=4
 
@@ -300,12 +300,10 @@ src_install() {
 		fi
 
 		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 20 32 40 48 64 128 ; do
-			insinto /usr/share/icons/hicolor/${size}x${size}/apps
-			newins ${PN}-${size}px.png ${PN}.png
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
 		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
+		newicon ${PN}-48px.png ${PN}.png
 		popd &>/dev/null || die
 	else
 		doins VBoxHeadless || die

app-emulation/virtualbox/virtualbox-4.1.20-r1.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/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild,v 1.2 2012/08/22 21:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild,v 1.3 2012/09/05 09:16:52 jlec Exp $
 
 EAPI=4
 
@@ -303,12 +303,10 @@ src_install() {
 		fi
 
 		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 20 32 40 48 64 128 ; do
-			insinto /usr/share/icons/hicolor/${size}x${size}/apps
-			newins ${PN}-${size}px.png ${PN}.png
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
 		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
+		newicon ${PN}-48px.png ${PN}.png
 		popd &>/dev/null || die
 	else
 		doins VBoxHeadless || die

app-laptop/pommed/pommed-1.21-r1.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/app-laptop/pommed/pommed-1.21-r1.ebuild,v 1.6 2012/05/02 20:22:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.21-r1.ebuild,v 1.7 2012/09/05 07:13:42 jlec Exp $
 
 EAPI="1"
 
@@ -90,9 +90,7 @@ src_install() {
 			fi
 		done
 
-		insinto /usr/share/applications
-		doins gpomme/gpomme.desktop
-		doins gpomme/gpomme-c.desktop
+		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
 		insinto /usr/share/gpomme/
 		doins -r gpomme/themes
 		doins gpomme/gpomme.glade

app-laptop/pommed/pommed-1.30.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/app-laptop/pommed/pommed-1.30.ebuild,v 1.7 2012/05/02 20:22:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.30.ebuild,v 1.8 2012/09/05 07:13:42 jlec Exp $
 
 EAPI="1"
 
@@ -99,9 +99,7 @@ src_install() {
 			fi
 		done
 
-		insinto /usr/share/applications
-		doins gpomme/gpomme.desktop
-		doins gpomme/gpomme-c.desktop
+		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
 		insinto /usr/share/gpomme/
 		doins -r gpomme/themes
 		doins gpomme/gpomme.glade

app-laptop/pommed/pommed-1.31.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/app-laptop/pommed/pommed-1.31.ebuild,v 1.7 2012/06/03 03:28:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.31.ebuild,v 1.8 2012/09/05 07:13:42 jlec Exp $
 
 EAPI="1"
 
@@ -99,9 +99,7 @@ src_install() {
 			fi
 		done
 
-		insinto /usr/share/applications
-		doins gpomme/gpomme.desktop
-		doins gpomme/gpomme-c.desktop
+		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
 		insinto /usr/share/gpomme/
 		doins -r gpomme/themes
 		doins gpomme/gpomme.glade

app-laptop/pommed/pommed-1.39.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/app-laptop/pommed/pommed-1.39.ebuild,v 1.5 2012/07/15 12:44:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.39.ebuild,v 1.6 2012/09/05 07:13:42 jlec Exp $
 
 EAPI="1"
 
@@ -99,9 +99,7 @@ src_install() {
 			fi
 		done
 
-		insinto /usr/share/applications
-		doins gpomme/gpomme.desktop
-		doins gpomme/gpomme-c.desktop
+		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
 		insinto /usr/share/gpomme/
 		doins -r gpomme/themes
 	fi

app-misc/nut/Manifest

@@ -1,2 +1,2 @@
-DIST nut-17.5.tar.gz 1315564 SHA256 a9e11b6192fd572bc3a6b8a9a4a1a96f21db2e68e57fe2c4816cddb96f895292 SHA512 1de7a28171bcfdd5fa7015583256abb674270a36609669ac0952b193e59c5990c90b051c5c29a6f03245fe019913eab9c6731d6944cedc219f07bcf519d13e96 WHIRLPOOL 877e6a1a1ce7c5f18720d3facb2082478fcee5629eadfb1c5c150e33143ce97758ee990f5ec86dbf6a885d3d9c9f7ff33ee4a2130d9a5069c771c5a4714df151
+DIST nut-17.12.tar.gz 1274051 SHA256 b2fbaa92cbb0351efc4b9a679c6fddb31ba56dd87c798fafecff12d21bb7d669 SHA512 eeefb7c0f0da918475ea1ef3a569f758d026fd6037579087b3e16d08d1fd026bff74466eca256e88de66676f5f782354fedb39f6546f13cca1fec4aff3782bcc WHIRLPOOL a0132c69591e14f137168efdd751cedaf832b42292ff0dec6d836eeccdc45dd43f07fb812df73bdcb58f54e9490be0fc16e14ddd76f270f7f3afd72db2166653
 DIST nut-17.7.tar.gz 1315707 SHA256 b41a9bf1687d6a7ce4a17b1afea19b0976a6828ec423c5b48ce648b80dbb5a5a SHA512 9f89d64a3b2a41835e845d272d57a905446e14626902106b2a88e1954748d4b7b33d7b2d0ea54e6d91cb6108667b9e187b57d5d9bc87eca1c9c799547d4d36de WHIRLPOOL 03ebba9de669cbddcd8ede868f70d416e7e6399b5156127745468c87256131f4fc653b5e36ea0e86eb8bb2fc0f5abbc043862e82ad42514803994e36adbe9878

app-misc/nut/files/nut-16.12-makefile.patch

@@ -1,80 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--prefix = /usr/local
-+prefix = /usr
- libdir = $(prefix)/lib/nut
- bindir = $(prefix)/bin
- mandir = $(prefix)/man/man1
-@@ -8,15 +8,6 @@
- EXECUTABLE := nut
- LIBS := -lm
- 
--FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
--ifeq ($(FLTK_CONFIG),)
--HAVE_FLTK = 0
--FLTK_NUT =
--else
--HAVE_FLTK = 1
--FLTK_NUT = fltk/Nut
--endif
--
- OS := $(shell uname -s)
- ifeq ($(OS),HP-UX)
- CC = cc
-@@ -24,7 +15,7 @@
- CC = gcc
- endif
- 
--CFLAGS := -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
-+CFLAGS += -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
- ifeq ($(CC),gcc)
- CFLAGS += -Wall -fno-inline -ansi
- endif
-@@ -34,15 +25,10 @@
- SOURCE := $(wildcard *.c)
- OBJS := $(patsubst %.c,%.o,$(SOURCE))
- 
--all: nut $(FLTK_NUT)
-+all: nut
- 
- nut:	$(OBJS)
--	$(CC) -O -o $(EXECUTABLE) $(OBJS) $(LIBS)
--
--ifeq ($(HAVE_FLTK),1)
--$(FLTK_NUT):
--	-cd fltk; $(MAKE)
--endif
-+	$(CC) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
- 
- deps:
- 	makedepend -Y. *.c >/dev/null 2>&1
---- a/fltk/Makefile
-+++ b/fltk/Makefile
-@@ -5,7 +5,7 @@
- NUTDIR := \".nutdb\"
- FOODDIR := \"$(libdir)\"
- EXECUTABLE := Nut
--LIBS := `fltk-config --ldstaticflags` -lXpm
-+LIBS := `fltk-config --ldflags` -lXpm
- 
- OS := $(shell uname -s)
- ifeq ($(OS),HP-UX)
-@@ -17,7 +17,7 @@
- CXX = g++
- endif
- 
--CFLAGS := -I.. `fltk-config --optim --cflags` -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
-+CFLAGS += -I.. `fltk-config --optim --cflags` -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
- 
- ifeq ($(CXX),g++)
- CFLAGS := -I.. `fltk-config --optim --cflags` -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
-@@ -29,7 +29,7 @@
- OBJS := ../anameal.o ../db.o ../food.o ../meal.o ../options.o ../prtmenu.o ../recmeal.o ../util.o $(patsubst %.cc,%.o,$(SOURCE))
- 
- nut:	$(OBJS)
--	$(CXX) -O -o $(EXECUTABLE) $(OBJS) $(LIBS)
-+	$(CXX) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
- 
- deps:
- 	makedepend -Y.. ../anameal.c ../db.c ../food.c ../meal.c ../options.c ../prtmenu.c ../recmeal.c ../util.c *.cc >/dev/null 2>&1

app-misc/nut/files/nut-17.12-makefile.patch

@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@
+ all: nut
+ 
+ nut:	$(OBJS)
+-	$(CC) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
++	$(CC) $(OPT) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ 
+ deps:
+ 	makedepend -Y. *.c >/dev/null 2>&1

app-misc/nut/files/nut-17.5-makefile.patch

@@ -1,86 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--prefix = /usr/local
-+prefix = /usr
- libdir = $(prefix)/lib/nut
- bindir = $(prefix)/bin
- mandir = $(prefix)/man/man1
-@@ -8,15 +8,6 @@
- EXECUTABLE := nut
- LIBS := -lm
- 
--FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
--ifeq ($(FLTK_CONFIG),)
--HAVE_FLTK = 0
--FLTK_NUT =
--else
--HAVE_FLTK = 1
--FLTK_NUT = fltk/Nut
--endif
--
- OS := $(shell uname -s)
- ifeq ($(OS),HP-UX)
- CC = cc
-@@ -26,7 +17,7 @@
- OPT = -O1
- endif
- 
--CFLAGS := $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
-+CFLAGS += -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
- ifeq ($(CC),gcc)
- CFLAGS += $(OPT) -Wall -fno-inline -ansi
- endif
-@@ -36,10 +27,10 @@
- SOURCE := $(wildcard *.c)
- OBJS := $(patsubst %.c,%.o,$(SOURCE))
- 
--all: nut $(FLTK_NUT)
-+all: nut
- 
- nut:	$(OBJS)
--	$(CC) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
- 
- ifeq ($(HAVE_FLTK),1)
- $(FLTK_NUT):
---- a/fltk/Makefile
-+++ b/fltk/Makefile
-@@ -5,24 +5,24 @@
- NUTDIR := \".nutdb\"
- FOODDIR := \"$(libdir)\"
- EXECUTABLE := Nut
--LIBS := `fltk-config --ldstaticflags` -lXpm
-+LIBS := $(shell fltk-config --ldflags) -lXpm
- 
- OS := $(shell uname -s)
- ifeq ($(OS),HP-UX)
- CC = cc
- CXX = /opt/aCC/bin/aCC
- OPT = -O
--LIBS := `fltk-config --ldflags` -lXpm
-+LIBS := $(shell fltk-config --ldflags) -lXpm
- else
- CC = gcc
- CXX = g++
- OPT = -Os
- endif
- 
--CFLAGS := -I.. `fltk-config --optim --cflags` $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
-+CFLAGS += -I.. $(shell fltk-config --optim --cflags) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
- 
- ifeq ($(CXX),g++)
--CFLAGS := -I.. `fltk-config --optim --cflags` -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
-+CFLAGS := -I.. $(shell fltk-config --optim --cflags) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
- endif
- 
- CXXFLAGS := $(CFLAGS)
-@@ -31,7 +31,7 @@
- OBJS := ../anameal.o ../db.o ../food.o ../meal.o ../options.o ../prtmenu.o ../recmeal.o ../util.o $(patsubst %.cc,%.o,$(SOURCE))
- 
- nut:	$(OBJS)
--	$(CXX) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
- 
- deps:
- 	makedepend -Y.. ../anameal.c ../db.c ../food.c ../meal.c ../options.c ../prtmenu.c ../recmeal.c ../util.c *.cc >/dev/null 2>&1

app-misc/nut/nut-17.12.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.12.ebuild,v 1.1 2012/09/05 16:37:54 jer Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-17.12-makefile.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\"
+}
+
+src_install() {
+	insinto /usr/share/nut
+	doins raw.data/*
+	dobin nut
+	doman nut.1
+}

app-misc/nut/nut-17.5.ebuild

@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.5.ebuild,v 1.4 2012/05/05 21:53:59 ranger Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Record what you eat and analyze your nutrient levels"
-HOMEPAGE="http://nut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
-IUSE="fltk"
-
-RDEPEND="
-	fltk? (
-		x11-libs/fltk:1
-		x11-libs/libXpm
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-17.5-makefile.patch
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) FOODDIR=\\\"/usr/share/nut\\\"
-	if use fltk; then
-		cd fltk
-		emake CXX=$(tc-getCXX) FOODDIR=\\\"/usr/share/nut\\\"
-	fi
-}
-
-src_install() {
-	insinto /usr/share/nut
-	doins raw.data/*
-	dobin nut
-	doman nut.1
-	if use fltk; then
-		dobin fltk/Nut
-		doicon nut.xpm
-		make_desktop_entry Nut nut nut Education
-	fi
-}

app-misc/roadnav/roadnav-0.19.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.19.ebuild,v 1.3 2010/02/07 09:08:51 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.19.ebuild,v 1.4 2012/09/05 07:15:31 jlec Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -50,8 +50,7 @@ src_install() {
 	# --docdir is broken and hardcoded to ${PN}
 	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${P}
 
-	insinto /usr/share/applications
-	doins "${S}"/roadnav.desktop
+	domenu "${S}"/roadnav.desktop
 }
 
 pkg_postinst() {

app-mobilephone/bitpim/bitpim-1.0.6-r1.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/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.7 2012/05/22 16:33:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.8 2012/09/05 07:16:37 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -133,10 +133,9 @@ src_install() {
 	fi
 
 	# Desktop file
-	insinto /usr/share/applications
 	sed -i -e "s|%%INSTALLBINDIR%%|/usr/bin|" -e "s|%%INSTALLLIBDIR%%|${RLOC}|" \
 		packaging/bitpim.desktop
-	doins packaging/bitpim.desktop
+	domenu packaging/bitpim.desktop
 }
 
 pkg_postinst() {

app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild,v 1.16 2011/03/27 12:11:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild,v 1.17 2012/09/05 09:20:17 jlec Exp $
 
 EAPI="1"
 
@@ -87,8 +87,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then

app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild,v 1.6 2011/03/27 12:11:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild,v 1.7 2012/09/05 09:20:17 jlec Exp $
 
 EAPI=2
 
@@ -96,8 +96,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then

app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild,v 1.4 2011/03/27 12:11:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild,v 1.5 2012/09/05 09:20:17 jlec Exp $
 
 EAPI=2
 
@@ -100,8 +100,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then

app-mobilephone/gnokii/gnokii-0.6.29.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.29.ebuild,v 1.8 2011/07/22 12:06:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.29.ebuild,v 1.9 2012/09/05 09:20:17 jlec Exp $
 
 EAPI=2
 
@@ -96,8 +96,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then

app-mobilephone/gnokii/gnokii-9999.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-9999.ebuild,v 1.9 2011/09/21 07:44:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-9999.ebuild,v 1.10 2012/09/05 09:20:17 jlec Exp $
 
 EAPI=2
 
@@ -93,8 +93,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then

app-office/gtimelog/gtimelog-0.7.0.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/app-office/gtimelog/gtimelog-0.7.0.ebuild,v 1.2 2012/07/25 18:39:54 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gtimelog/gtimelog-0.7.0.ebuild,v 1.3 2012/09/05 09:21:06 jlec Exp $
 
 EAPI="4"
 
@@ -55,8 +55,7 @@ src_test() {
 
 src_install() {
 	domenu gtimelog.desktop
-	insinto /usr/share/pixmaps
-	doins src/gtimelog/gtimelog-*.png
+	doicon src/gtimelog/gtimelog-*.png
 	insinto /usr/share/gtimelog
 	doins src/gtimelog/*.ui src/gtimelog/gtimelog.png
 	exeinto /usr/share/gtimelog/scripts

app-office/gtimelog/gtimelog-0.7.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/app-office/gtimelog/gtimelog-0.7.1.ebuild,v 1.2 2012/07/25 18:39:54 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gtimelog/gtimelog-0.7.1.ebuild,v 1.3 2012/09/05 09:21:06 jlec Exp $
 
 EAPI="4"
 
@@ -55,8 +55,7 @@ src_test() {
 
 src_install() {
 	domenu gtimelog.desktop
-	insinto /usr/share/pixmaps
-	doins src/gtimelog/gtimelog-*.png
+	doicon src/gtimelog/gtimelog-*.png
 	insinto /usr/share/gtimelog
 	doins src/gtimelog/*.ui src/gtimelog/gtimelog.png
 	exeinto /usr/share/gtimelog/scripts

app-office/texmaker/Manifest

@@ -1,5 +1,3 @@
 DIST texmaker-3.1.tar.bz2 6018840 SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78 SHA512 5fa2ad28198f712a73b41b1bc296ad8267182a59e1d5631336c20f527c8f88178e6fbd9fc8a40ef8559283c0b6e548c9d29c9e038c0b382cf60ad28a4057d811 WHIRLPOOL 94e80c3d345e478ace202f9c3b8af17b2966681f5dd94361704d48d1c2617f72596f75b769a8baed4bf06692dae8ca651da34e75751e03316077b178d16e864b
 DIST texmaker-3.3.4.tar.bz2 13028203 SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5 SHA512 014bfbe2a72aa2aef8d71972526959116a8dc39852475ea8e9da0d0fbbc4e8441c04b124be93911a0b637436f94ecab730150064f2bb3842e6566cd26116c28e WHIRLPOOL fb0a5d150ac463905b0c243e4402858e0142c42f1278f185e678e48a690369830a75848b342f0f22c3db6495580ee03eb65cbcf989bad52b63f87371d660970d
-DIST texmaker-3.4.1.tar.bz2 13060400 SHA256 bc11eb6d72c69919fc63bc3e44dcfc920cb03be64acbd7301b7bbce2ae12f265 SHA512 ea4b1712808520f9ab3a189da54a61aa9c85e5ca37d2d2722a08796bf91aa1641b10eddeeb157ff1dde0b825cdbb71455e78efe82f8ed63796207828958f8b59 WHIRLPOOL ba90a702471e76e539e202c1736ed446bf53957c5bccf41028b4cf0811266bbc09911b05e9d03775c02c81189b64618ac6d9eab668aaeb96f01c3c7ab874a8fc
-DIST texmaker-3.4.tar.bz2 13059853 SHA256 0075128ab2e3342722900b3ee2b2870638ea333837d3beb2fadb9ebd0fdf6310 SHA512 22ea3a7ee8692cbcdf301a072aa532838a780e74cfea15e42dff222f882ad4f4f10f05f7638d0d6f581f805a6583662e427d38c4a17e74408d684cb6b64a887e WHIRLPOOL ea5e79d01f694b0f70cbb6e3bddc51f8403218b16b23ceea83146e96d87791a5f6a7ba3bb3a60824b8f6aa8cc78e764c4d7d14171b1c4b5b6fb505eff722221f
 DIST texmaker-3.5.tar.bz2 13144036 SHA256 eddc8a60afc5f53d1f31154a2f0b6a60b8a1c3bd09dad1e8eaf5868231dfbcf0 SHA512 ae1c6491ed91863a7ecf2bcdcdf19832fb53a0c82e66e79825ef0d3e21300b3239550117aba75373303ca0eea448487434afce311c3a37d57a5ccb3f892d232a WHIRLPOOL 174c8ff38f643216b1367d60c6f48dcc684e3b409e37bcba534dbc5c84cfc52c75978f68652d6743c644ec8764409946ef9e7fd0e555cec0aadd5e84a1318d3f

app-office/texmaker/files/texmaker-3.4-hunspell.patch

@@ -1,148 +0,0 @@
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   40 ++++------------------------------------
- 6 files changed, 9 insertions(+), 41 deletions(-)
-
-diff --git a/latexeditor.h b/latexeditor.h
-index c12bbe3..94b9a3c 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
- 
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 5951656..796eb28 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index 045ffc8..bf2705a 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 4e11282..9625bd5 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell poppler-qt4
- TEXMAKERVERSION=3.4
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
- 	synctex_parser_utils.h \
- 	usertagslistwidget.h \
- 	addtagdialog.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -171,18 +153,6 @@ SOURCES	+= main.cpp \
- 	synctex_parser_utils.c \
- 	usertagslistwidget.cpp \
- 	addtagdialog.cpp \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -278,13 +248,11 @@ isEmpty( ICONDIR ) {
-     ICONDIR=/usr/share/pixmaps
- }
- 
--INCLUDEPATH  += /usr/include/poppler/qt4
--LIBS         += -L/usr/lib -lpoppler-qt4
--LIBS         += -L/usr/lib -lz
-+LIBS         += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- 
- INSTALLS = target

app-office/texmaker/files/texmaker-3.4.1-hunspell.patch

@@ -1,148 +0,0 @@
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   40 ++++------------------------------------
- 6 files changed, 9 insertions(+), 41 deletions(-)
-
-diff --git a/latexeditor.h b/latexeditor.h
-index c12bbe3..94b9a3c 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
- 
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 5951656..796eb28 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index 045ffc8..bf2705a 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 4e11282..9625bd5 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell poppler-qt4
- TEXMAKERVERSION=3.4.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
- 	synctex_parser_utils.h \
- 	usertagslistwidget.h \
- 	addtagdialog.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -171,18 +153,6 @@ SOURCES	+= main.cpp \
- 	synctex_parser_utils.c \
- 	usertagslistwidget.cpp \
- 	addtagdialog.cpp \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -278,13 +248,11 @@ isEmpty( ICONDIR ) {
-     ICONDIR=/usr/share/pixmaps
- }
- 
--INCLUDEPATH  += /usr/include/poppler/qt4
--LIBS         += -L/usr/lib -lpoppler-qt4
--LIBS         += -L/usr/lib -lz
-+LIBS         += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- 
- INSTALLS = target

app-office/texmaker/texmaker-3.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/app-office/texmaker/texmaker-3.1.ebuild,v 1.9 2012/05/03 20:00:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.1.ebuild,v 1.10 2012/09/05 09:24:07 jlec Exp $
 
 EAPI="3"
 
@@ -57,9 +57,7 @@ src_prepare() {
 src_install() {
 	emake INSTALL_ROOT="${ED}" install || die "make install failed"
 
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
+	doicon utilities/texmaker*.png utilities/texmaker.svg || die
 
 	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
 }

app-office/texmaker/texmaker-3.3.4.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/app-office/texmaker/texmaker-3.3.4.ebuild,v 1.4 2012/08/08 20:20:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.3.4.ebuild,v 1.5 2012/09/05 09:24:07 jlec Exp $
 
 EAPI=4
 
@@ -60,9 +60,7 @@ src_prepare() {
 src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png
-	doins utilities/texmaker.svg
+	doicon utilities/texmaker*.png utilities/texmaker.svg
 
 	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
 }

app-office/texmaker/texmaker-3.4.1.ebuild

@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.4.1.ebuild,v 1.1 2012/07/23 07:37:26 jlec Exp $
-
-EAPI=4
-
-inherit base qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/qt-gui:4
-	x11-libs/qt-core:4
-	x11-libs/qt-webkit:4
-	app-text/hunspell"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-hunspell.patch
-	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
-	)
-src_configure() {
-	eqmake4 \
-		${PN}.pro \
-		PREFIX="${EPREFIX}/usr" \
-		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png
-	doins utilities/texmaker.svg
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}

app-office/texmaker/texmaker-3.4.ebuild

@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.4.ebuild,v 1.1 2012/07/19 09:40:02 jlec Exp $
-
-EAPI=4
-
-inherit base qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/qt-gui:4
-	x11-libs/qt-core:4
-	x11-libs/qt-webkit:4
-	app-text/hunspell"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-hunspell.patch
-	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
-	)
-src_configure() {
-	eqmake4 \
-		${PN}.pro \
-		PREFIX="${EPREFIX}/usr" \
-		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png
-	doins utilities/texmaker.svg
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}

app-office/texmaker/texmaker-3.5.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/app-office/texmaker/texmaker-3.5.ebuild,v 1.1 2012/08/26 09:48:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.ebuild,v 1.3 2012/09/05 14:58:35 jlec Exp $
 
 EAPI=4
 
@@ -54,17 +54,15 @@ PATCHES=(
 src_configure() {
 	eqmake4 \
 		${PN}.pro \
-		PREFIX="${EPREFIX}/usr" \
-		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+		PREFIX=/usr \
+		DESKTOPDIR=/usr/share/applications \
+		ICONDIR=/usr/share/pixmaps
 }
 
 src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png
-	doins utilities/texmaker.svg
+	doicon utilities/texmaker*.png utilities/texmaker.svg
 
 	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
 }

app-office/texstudio/Manifest

@@ -1,2 +1,2 @@
-DIST texstudio-2.2.tar.gz 12522002 SHA256 89533783f95428e91d84926b720bb8972241bd7b5be1e3d2b8cffab742bc6749 SHA512 49dccf188ec8a99a2225509209a927ddf0dbe7ddc0336f96cd544c61779e7686783cccf0b4d08d9b05bd95443ef1e77ab6db7ab3b19a7ae1dde71b382841c9e0 WHIRLPOOL 7a20a6869e55b97688e4fe00f6cafef64fa3cc059bbb4e8c9bba07526553f84d1944da6832cf1964e1a2d91277e84fecc73e8a54129060b3e2fe8835e7023c96
 DIST texstudio-2.3.tar.gz 25524647 SHA256 ace47800118d3bdeb80dedcda6e659142f4ed5e5c2d8e9eb945ebd7ae8293d93 SHA512 c43864f51be4344adc10140b75a78f11e75f32afdea4c3310efd5897a6e628192dd4335b8250f2a2de8e287d9533864dca26e0a65d6d0f16322a4b3c18e81f86 WHIRLPOOL 4bcaff04bdabd7cb6156330c8e1e66d68fc9f781797eca8ef00198a48d509eed724b3c05a78bcce579f1c1fdbb76a25b6fd4708c05134ed251dcf2585daac955
+DIST texstudio-2.4.tar.gz 13809336 SHA256 95ecd0e7aab5840b147c6bee68d3c5877d3cce0006117894b3056da211dc77a9 SHA512 394ddf6529284fced1db647db40b054490a49e01ed3b52515a880930f53a757a590b415c4b703442f89191e2be36d56ddb714ecc3445b3e49b37c1ad282a97e0 WHIRLPOOL 2373f9420c9d59d2c56d34c9485f699fe251785f366fb83ef03baa4a26a47fd81feaa287ca02fba55b92cd35e7ae6981254449d2f4916594b4bc292a887715dd

app-office/texstudio/files/texstudio-2.4-desktop.patch

@@ -0,0 +1,22 @@
+ utilities/texstudio.desktop | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/utilities/texstudio.desktop b/utilities/texstudio.desktop
+index 199255f..9c95afd 100644
+--- a/utilities/texstudio.desktop
++++ b/utilities/texstudio.desktop
+@@ -1,13 +1,12 @@
+ [Desktop Entry]
+ Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
+-Encoding=UTF-8
+ Exec=texstudio %F
+ GenericName=LaTeX Editor
+ GenericName[fr]=Editeur LaTeX
+ Comment=LaTeX development environment
+ Comment[fr]=Environnement de développement LaTeX
+ Icon=/usr/share/texstudio/texstudio48x48.png
+-MimeType=text/x-tex;
++MimeType=text/X-tex;
+ Name=TeXstudio
+ StartupNotify=false
+ Terminal=false

app-office/texstudio/files/texstudio-2.4-hunspell.patch

@@ -0,0 +1,70 @@
+ texstudio.pro | 35 +++--------------------------------
+ 1 file changed, 3 insertions(+), 32 deletions(-)
+
+diff --git a/texstudio.pro b/texstudio.pro
+index ee28d78..4ba31c0 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -1,7 +1,9 @@
+ TEMPLATE = app
+ LANGUAGE = C++
+ DESTDIR = ./
+-CONFIG += qt precompile_header uitools
++CONFIG += qt precompile_header uitools link_pkgconfig
++PKGCONFIG = hunspell
++PHONON=
+ exists(texmakerx_my.pri):include(texmakerx_my.pri)
+ QT += network \
+     xml \
+@@ -52,24 +54,6 @@ HEADERS += texmaker.h \
+     debughelper.h \
+     thesaurusdialog.h \
+     xmltagslistwidget.h \
+-    hunspell/affentry.hxx \
+-    hunspell/affixmgr.hxx \
+-    hunspell/atypes.hxx \
+-    hunspell/baseaffix.hxx \
+-    hunspell/csutil.hxx \
+-    hunspell/dictmgr.hxx \
+-    hunspell/hashmgr.hxx \
+-    hunspell/htypes.hxx \
+-    hunspell/hunspell.hxx \
+-    hunspell/hunspell.h \
+-    hunspell/langnum.hxx \
+-    hunspell/license.hunspell \
+-    hunspell/phonet.hxx \
+-    hunspell/suggestmgr.hxx \
+-    hunspell/license.myspell \
+-    hunspell/filemgr.hxx \
+-    hunspell/hunzip.hxx \
+-    hunspell/w_char.hxx \
+     qcodeedit/lib/qeditorinputbinding.h \
+     qcodeedit/lib/qeditorinputbindinginterface.h \
+     randomtextgenerator.h \
+@@ -85,7 +69,6 @@ HEADERS += texmaker.h \
+     latexdocument.h \
+     unicodeinsertion.h \
+     universalinputdialog.h \
+-    hunspell/replist.hxx \
+     scriptengine.h \
+     insertgraphics.h \
+     txstabwidget.h \
+@@ -154,18 +137,6 @@ SOURCES += main.cpp \
+     codesnippet.cpp \
+     thesaurusdialog.cpp \
+     xmltagslistwidget.cpp \
+-    hunspell/affentry.cxx \
+-    hunspell/affixmgr.cxx \
+-    hunspell/csutil.cxx \
+-    hunspell/dictmgr.cxx \
+-    hunspell/hashmgr.cxx \
+-    hunspell/hunspell.cxx \
+-    hunspell/phonet.cxx \
+-    hunspell/replist.cxx \
+-    hunspell/suggestmgr.cxx \
+-    hunspell/utf_info.cxx \
+-    hunspell/filemgr.cxx \
+-    hunspell/hunzip.cxx \
+     encodingdialog.cpp \
+     qcodeedit/lib/qeditorinputbinding.cpp \
+     randomtextgenerator.cpp \

app-office/texstudio/texstudio-2.2.ebuild

@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.2.ebuild,v 1.2 2012/05/03 20:00:40 jdhore Exp $
-
-EAPI=4
-
-inherit base qt4-r2
-
-DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
-HOMEPAGE="http://texstudio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="video"
-
-COMMON_DEPEND="
-	app-text/hunspell
-	app-text/poppler[qt4]
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-script-4.6.1:4
-	>=x11-libs/qt-test-4.6.1:4
-	>=x11-libs/qt-webkit-4.6.1:4
-	video? ( media-libs/phonon )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/-/}
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_prepare() {
-	find hunspell -delete
-	sed 's:hunspell/hunspell:hunspell:g' -i *.h || die
-	if use video; then
-		sed "s:PHONON =:PHONON=true:g" -i ${PN}.pro || die
-	fi
-	qt4-r2_src_prepare
-}

app-office/texstudio/texstudio-2.3-r1.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.3-r1.ebuild,v 1.1 2012/07/15 09:31:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.3-r1.ebuild,v 1.2 2012/09/05 07:28:12 jlec Exp $
 
 EAPI=4
 
-inherit base qt4-r2
+inherit base fdo-mime qt4-r2
 
 DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
@@ -53,10 +53,14 @@ src_prepare() {
 }
 
 src_install() {
-	make_desktop_entry texstudio "LaTeX Editor" texstudio "text/x-tex"
+	make_desktop_entry texstudio "LaTeX Editor" texstudio "text/X-tex"
 	for i in 16x16 22x22 32x32 48x48 64x64; do
 		insinto /usr/share/icons/hicolor/${i}
 		newins utilities/${PN}${i}.png ${PN}.png
 	done
 	qt4-r2_src_install
 }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}

app-office/texstudio/texstudio-2.4.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.3.ebuild,v 1.4 2012/07/18 18:24:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.4.ebuild,v 1.1 2012/09/05 07:28:12 jlec Exp $
 
 EAPI=4
 
-inherit base qt4-r2
+inherit base fdo-mime qt4-r2
 
 DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
@@ -37,7 +37,10 @@ DEPEND="${COMMON_DEPEND}
 S="${WORKDIR}"/${P/-/}
 
 PATCHES=(
-	"${FILESDIR}/${P}-hunspell.patch"
+	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${P}-desktop.patch
+# Get it from fedora once they have bumped
+#	"${FILESDIR}"/${P}-xdg-open.patch
 	)
 
 src_prepare() {
@@ -48,3 +51,15 @@ src_prepare() {
 	fi
 	qt4-r2_src_prepare
 }
+
+src_install() {
+	for i in 16x16 22x22 32x32 48x48 64x64; do
+		insinto /usr/share/icons/hicolor/${i}
+		newins utilities/${PN}${i}.png ${PN}.png
+	done
+	qt4-r2_src_install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}

app-text/kchmviewer/kchmviewer-6.0-r1.ebuild

@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild,v 1.1 2012/08/24 00:11:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild,v 1.2 2012/09/05 09:27:37 jlec Exp $
 
 EAPI=4
 KDE_REQUIRED="never"
 KDE_LINGUAS_DIR="po"
 KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr zh_CN zh_TW"
-inherit fdo-mime qt4-r2 kde4-base
+inherit fdo-mime qt4-r2 kde4-base eutils
 
 DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
 HOMEPAGE="http://www.kchmviewer.net/"
@@ -81,8 +81,7 @@ src_install() {
 		domenu packages/kchmviewer.desktop || die
 		dodoc ChangeLog README || die
 	fi
-	insinto /usr/share/pixmaps/
-	doins packages/kchmviewer.png || die
+	doicon packages/kchmviewer.png || die
 	dodoc DBUS-bindings FAQ || die
 }
 

app-text/kchmviewer/kchmviewer-6.0.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0.ebuild,v 1.4 2012/05/29 19:49:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0.ebuild,v 1.5 2012/09/05 09:27:37 jlec Exp $
 
 EAPI=3
 KDE_REQUIRED="never"
-inherit fdo-mime qt4-r2 kde4-base
+inherit fdo-mime qt4-r2 kde4-base eutils
 
 DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
 HOMEPAGE="http://www.kchmviewer.net/"
@@ -71,8 +71,7 @@ src_install() {
 		domenu packages/kchmviewer.desktop || die
 		dodoc ChangeLog README || die
 	fi
-	insinto /usr/share/pixmaps/
-	doins packages/kchmviewer.png || die
+	doicon packages/kchmviewer.png || die
 	dodoc DBUS-bindings FAQ || die
 }
 

app-text/searchmonkey/searchmonkey-2.0.0.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/app-text/searchmonkey/searchmonkey-2.0.0.ebuild,v 1.3 2012/07/15 16:19:29 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/searchmonkey-2.0.0.ebuild,v 1.4 2012/09/05 07:17:10 jlec Exp $
 
 EAPI=4
 
@@ -33,6 +33,5 @@ src_install() {
 
 	# Hand-made desktop icon
 	doicon pixmaps/searchmonkey-300x300.png
-	insinto /usr/share/applications/
-	doins "${FILESDIR}"/${P}.desktop
+	domenu "${FILESDIR}"/${P}.desktop
 }

app-text/tkman/tkman-2.2-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/tkman-2.2-r1.ebuild,v 1.6 2009/07/19 17:48:07 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/tkman-2.2-r1.ebuild,v 1.7 2012/09/05 07:17:12 jlec Exp $
 
 EAPI=2
 inherit eutils
@@ -33,6 +33,5 @@ src_install() {
 	insinto /usr/share/icons
 	doins contrib/TkMan.gif
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/tkman.desktop
+	domenu "${FILESDIR}"/tkman.desktop
 }

app-text/xchm/xchm-1.18.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.18.ebuild,v 1.4 2011/03/04 01:27:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.18.ebuild,v 1.5 2012/09/05 07:22:23 jlec Exp $
 
 EAPI=2
 
@@ -37,8 +37,7 @@ src_install() {
 	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
 	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/xchm.desktop
+	domenu "${FILESDIR}"/xchm.desktop
 	insinto /usr/share/mime/packages
 	doins "${FILESDIR}"/xchm.xml
 }

app-text/xchm/xchm-1.20.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.20.ebuild,v 1.1 2011/06/25 08:42:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.20.ebuild,v 1.2 2012/09/05 07:22:23 jlec Exp $
 
 EAPI="4"
 
@@ -36,8 +36,7 @@ src_install() {
 	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
 	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/xchm.desktop
+	domenu "${FILESDIR}"/xchm.desktop
 	insinto /usr/share/mime/packages
 	doins "${FILESDIR}"/xchm.xml
 }

dev-db/sqlite/Manifest

@@ -1,16 +1,10 @@
 DIST sqlite-2.8.16.tar.gz 981834 SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512 262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a WHIRLPOOL 78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff
-DIST sqlite-autoconf-3071000.tar.gz 1801640 SHA256 9c1775057af5cc8b6cc64808b9553d77beccf3757e16ecee3bc878404d9c43e3 SHA512 b66ca1eb59eec97415d110879077c0c7cac24e79cdd1f98143cfaa663d5c08888bc243ac3c10efe36e1c9c15b4fb9d661882e0e80c24f2b86bf385f81e058120 WHIRLPOOL c11350922f1aa99b60facaca81ad25914365ae1fa3f86b5cc18b39ae6d34a9b8078e27d3114ac8bf9ea8d0a8fc7034c8e375a3e5dff4a3749efa2e0945b4394e
-DIST sqlite-autoconf-3071100.tar.gz 1807754 SHA256 2badc75dc536249bcd68c44d2a655724285d054303251eaff9d355194cb3476b SHA512 f5cf7633e5560df835646212c4fa73137fe999c3c6b425288d52d4f3e2e06c3c4b341ba3bafccbe52a9bb9fc0e772f6e5ce9b532cb033b0712c8dd841b782355 WHIRLPOOL f3a09a1325fec96c2a711adce27e1384598c363e2ecc6efbd754d908d8f26d293bbb1d3d632f56a657dbd6ede8643a7931a413b0d78c03294521088b7e4e089a
-DIST sqlite-autoconf-3071200.tar.gz 1827241 SHA256 ca1735d13975be84cba87ea1b62ae0ab01fdc01ef21d7547982a2b118c9fc649 SHA512 b48c9e5fc4a834d42fc8989c6368e5905c8bce5e2952d3f275cc95eaa990f8478b5294f4d591f3bed302f4ce43d6a2c276255e5529bff6f8c3c5e834d7f7c7e0 WHIRLPOOL a2189dda48476f358140e5d4009fca981465398219d6cb48005bd6bfc1023ef142d7591f42a21d5374e79ac2748ee5eeabfdd78513d03226349bafb3181f5ca6
 DIST sqlite-autoconf-3071201.tar.gz 1831193 SHA256 b4ce93881cb88e7d1d0f2ad50a206b600163b40fea6df9d0749ad152aaebf845 SHA512 bd7eabc750e375b62e6ec79f77a218310b4fac958043389a5f4f0ef7e8aff8446ad2743d3f27ab66b86709902ba49fb4317fd4340011813c930e3c5828102afd WHIRLPOOL 98d4905f0584a357bb3b6faa55e076ced240fc1ff8f4b3db1113dbe2bb5fd1f7337abc09af45ed2698e47f4742d556384275e47256a91849ebb12493f8a9fc84
 DIST sqlite-autoconf-3071300.tar.gz 1845778 SHA256 ac566819f82ec4cc2ff6c5cc90987ca38e589efbd79ff263838bbc62356ab119 SHA512 206b107a8806ea6caccc08645777feb1b5421d35792e6075037c1646c424c66c0e1ebe5d146f2cf2e143359e960c1183ce742e8523cd9775f975d220fabb48cd WHIRLPOOL 74f75299960b8b69e67503091eea114709f02494b2871d8bcfe1612714b93aa833f96ebbc1d9ad418b69de44c90aa76ca169086a5fc65359b08894a9d79086fa
-DIST sqlite-doc-3071000.zip 3630343 SHA256 f74c3681111d35a58449b0c1851a8f852b9cb8c4ec19a6f0ecaae9f2d1f7ca28 SHA512 af85ce9b13ef1c4109c1c21796d3520f432d91339ee5ab12783181dc06494b5bee4fb250925f02d328f7f276ba9558a9b936e6f704f9cb3ac6301e1cd09cc058 WHIRLPOOL 40270220ae460190e08e66e3f5bf43bb592f6caa63e6d71a96939724a68f5ce0ca9dd207552f9f0ac2ea39c03c0798f8ab84b410c24483c3b41610b5186a3203
-DIST sqlite-doc-3071100.zip 4069512 SHA256 78541dd7190208d604a933f522a86d775422df44262310212189015b4b0f26ca SHA512 e402657fe71adcade24173fa636a5aa26a3fa5fac1f9aefc4416c8d4c19dc8379755d8116d7a8e1c1d3de8d19cd80a805a4e583ab77aaf8eb7fcbc6f546ed2e5 WHIRLPOOL f28465b902083d67d97898b3412ff328281189a872322ae833dc515187e5a702a0b7455ccf4fab4219a1a12b3137ea5613622ec7115b2b608fec67338795eaf5
-DIST sqlite-doc-3071200.zip 4083373 SHA256 cf2e244190802836f73b0ab2036a33ac430f17c489f70fe4a14280d6c7e64986 SHA512 c3b56518a9aaf2b53d1069ee2b3717df35fdfc566671a8ace7bf546223f05c8c25546ed30fd6b948d32ffbb3b3d8de50f4abb31452972af129932fa52fd6fa46 WHIRLPOOL 682f15d7624bae906af3be011829e85963227330898f10317d965160c7e06b67875bbe72957ba6e2ff1e4146807178dd58acc6a1bdbe126ce103370eff1fd41c
+DIST sqlite-autoconf-3071400.tar.gz 1832194 SHA256 de6c01d9fabf4d10733b1920d9a3143634ed516b90f4759b3b5b79857a39b724 SHA512 e0efb52a3431e51a152e2d040adf4ce8c5677a1634c33090b4ba265a4ef6d3af070bcc8a088a9103c924107e3edc68329bb2cef725570ca66358bd0ee822108f WHIRLPOOL 82ae24cf5ba34b7582bdd40a64bfb10d95792f19cee41b9fad729a700ee757b7fef986825bacf7522016b0bc84682d216176d5d1259fbe26eb8edab070eee117
 DIST sqlite-doc-3071201.zip 4088017 SHA256 e86542934b1d47780f9e1fe415b5b792feabc8d520a28f9f65b049922a8fa2e5 SHA512 fa068d65b8b37866b12ddb49504ff2a37a95c705e19257a4d737ac0921e68c5d58f64207fa64c54e1da217644c08398e1c59b96efb480b8b49997322474b5e71 WHIRLPOOL a5e389a46364a3c57babc528f8c569aa05803396b99cf84af22d2a0e0d43406854c5883ee704b518755ee35b9673671b4b862444c493dfd5d2c12860f71b6a39
 DIST sqlite-doc-3071300.zip 3868922 SHA256 7212d48110b7b39a64be3dd48ab7ad9e782330dd0709c474f1ae4f3e394c04bf SHA512 8fa9bef286919fcc0960b54e3501321ada89d442e0c83ad48ece35cce01996d35ae6a810a01debe2a3485ceab90f3bffddf48b42adcb940f4fb6353e70cac963 WHIRLPOOL 549cc7a7218c83e118a29ea55b8cc1f360cfb2b04b8ea857f7ff0aa038c37256d625a27ab239b325def3bb59e3d9423b15a800fdc412315f040dfeed2deafe42
-DIST sqlite-src-3071000.zip 4682084 SHA256 e976196a9c64bd152917760a134834a881c9eebc34f49125102a8918c5cd86a4 SHA512 2faaaf5578ce619e70e74403e09c5040d3cc53d1ddf15a2dc3b26bbd929378b7d8b5bb599b61c1c0a6196406a15769e1c21db6a508fe03547fcefdf235ac6021 WHIRLPOOL f3dd2788eed796782cef8217c3472d1bdc0cad54611c6f4e066dd1b1485909e1ae823ce2bed1a29766c352962ac8c12336481b0459c83c947dfa42863dec77f9
-DIST sqlite-src-3071100.zip 4705421 SHA256 939262fe70b5e4dcd04f29d6f1d8221542f24e71adf72f0d4a8c671d8b6d9441 SHA512 8a81def1b6b0cdd1afca04d81ae37ce5296a17f88f090059bc43338cfe3e40cf8b243b35143e91338e8244defb108da62a8633c1fe782d36621f502f7e55ed52 WHIRLPOOL cd4e6ad6da41268dacf3118fdc7aaad9b1e4b55547f58cae677b03c925715f07e881e3cf11fdce433ebb4649e1529c6ec3d2be6d515c811cabdb2c36a3ac0241
-DIST sqlite-src-3071200.zip 4648718 SHA256 cbdba7d03e24ca34550a9910036ccceb9e5173cb28c850c788a6da8d8b130725 SHA512 2562f961c7a2ae4eaa94a568d8586cb7b060f955e5ec712bd019aabce26115e0b005503dd1f939ae839bfaa78a688a4cfb55da916dcbcb0fe3534bc4468990cc WHIRLPOOL 10c50ff29d2c571b58324f2043f58e45580a2db5264ea577db08302f699d77fcd5e9c0bdf28ef3a19db181c46b2f9e841b1b9a24556187c86a67c70aec1bf7b0
+DIST sqlite-doc-3071400.zip 4109131 SHA256 d427a538339e7641168d034b6d07b241014e87330c143372a47f1ce082262a4a SHA512 0475f7a894ecf7daa942b85cd136efdd8e46cb0f70ae781ef1ac7a0e1b145a0a49a04abc2afc641b4e042c4fb90cecf2d1eda3ed856e9aaa8a27876090b7cf06 WHIRLPOOL 9ac485d5f5b4e2ae09b1763abf9e43fc83dea2f9be5bbd8309956abbc55e70f124240580614546a8e776340fc0b2d4bcfd60392f554581d36a4316c17eee4bf0
 DIST sqlite-src-3071201.zip 4672290 SHA256 dc4508930f54cc96c6f20a5b6db810b531f4af416e1df8dde2b85af5f316da2e SHA512 9187bd77095872872676c730692bfbd4a06e91e681918ccd72f98057d9db7db2167a752e37933de81d6662b118c81a78240fc471a3516f947518b7e5a6380306 WHIRLPOOL 16b70d8d37efa7e933671af3e7130cfe18dd4fb1170faf9977ff440e261ad3aca43518216fcd82b3d01a4381e08b8bf9cc38cce2ea2485f75826795020468ec9
 DIST sqlite-src-3071300.zip 4923284 SHA256 4cf9b373cbdf1e1ae7f343b40e8a4007b298dee15a6ca7906feffa12c636f118 SHA512 79364cccd22ff436e331f4e2bc568f014be44e0a6bb071d9577b6b67ef11aa45341699b2dd7dd5ec4de1b9946afe302c84db282bf4668e1914f891c36522ab8c WHIRLPOOL 54369ed44677f9645a1798f4a398d42c062268f046580074e5fffa9624458b402db0b46feae464f27245a4ae4eb3d9d67b393198d657b6cdd5372fecebd048c6
+DIST sqlite-src-3071400.zip 4966421 SHA256 254f0ad2d00dde577d39515899d7785d966f2746d701527625e69ae9c07d64b7 SHA512 d6f2e78c79de61d8eb64a144a2cd52a79a6255e4224a006425d03dee0667ce48a036caa0493f7e1249d62396e60a04b131337232c31b129f2b9926e5675b50e6 WHIRLPOOL 0a85d4410e415839f8e4957d1086acb7bdec224de71f68d112cd04e2ead7a34b7f6d54033086fb35ee75d5f14b460113740d90b40bc8aeb0d1cebc46b721ddff

dev-db/sqlite/sqlite-3.7.10.ebuild

@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.10.ebuild,v 1.8 2012/04/01 17:06:17 armin76 Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
-# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
-DOC_PV="${SRC_PV}"
-
-DESCRIPTION="A SQL Database Engine in a C Library"
-HOMEPAGE="http://sqlite.org/"
-SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${DOC_PV}.zip )
-	tcl? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
-	!tcl? (
-		test? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
-		!test? ( http://sqlite.org/${PN}-autoconf-${SRC_PV}.tar.gz )
-	)"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
-
-RDEPEND="icu? ( dev-libs/icu )
-	readline? ( sys-libs/readline )
-	tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	tcl? ( app-arch/unzip )
-	test? (
-		app-arch/unzip
-		dev-lang/tcl
-	)"
-
-amalgamation() {
-	use !tcl && use !test
-}
-
-pkg_setup() {
-	if amalgamation; then
-		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
-	else
-		S="${WORKDIR}/${PN}-src-${SRC_PV}"
-	fi
-}
-
-src_prepare() {
-	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
-	use prefix && eautoreconf
-
-	epunt_cxx
-}
-
-src_configure() {
-	# `configure` from amalgamation tarball doesn't add -DSQLITE_DEBUG or -DNDEBUG flag.
-	if amalgamation; then
-		if use debug; then
-			append-cppflags -DSQLITE_DEBUG
-		else
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Support column metadata, bug #266651
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support R-trees, bug #257646
-	append-cppflags -DSQLITE_ENABLE_RTREE
-
-	if use icu; then
-		append-cppflags -DSQLITE_ENABLE_ICU
-		if amalgamation; then
-			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		else
-			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		fi
-	fi
-
-	# Support FTS3, bug #207701
-	if use fts3; then
-		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
-	fi
-
-	# Enable secure_delete pragma by default
-	if use secure-delete; then
-		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
-	fi
-
-	# Support soundex, bug #143794
-	if use soundex; then
-		append-cppflags -DSQLITE_SOUNDEX
-	fi
-
-	# Enable unlock notification
-	if use unlock-notify; then
-		append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-	fi
-
-	local extensions_option
-	if amalgamation; then
-		extensions_option="dynamic-extensions"
-	else
-		extensions_option="load-extension"
-	fi
-
-	# Starting from 3.6.23, SQLite has locking strategies that are specific to
-	# OSX. By default they are enabled, and use semantics that only make sense
-	# on OSX. However, they require gethostuuid() function for that, which is
-	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
-	# versions of OSX we have to disable all this nifty locking options, as
-	# suggested by upstream.
-	if [[ "${CHOST}" == *-darwin[56789] ]]; then
-		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
-	fi
-
-	if [[ "${CHOST}" == *-mint* ]]; then
-		append-cppflags -DSQLITE_OMIT_WAL
-	fi
-
-	# `configure` from amalgamation tarball doesn't support
-	# --with-readline-inc and --(enable|disable)-tcl options.
-	econf \
-		--disable-static \
-		$(use_enable extensions ${extensions_option}) \
-		$(use_enable readline) \
-		$(use_enable threadsafe) \
-		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
-		$(amalgamation || use_enable debug) \
-		$(amalgamation || echo --enable-tcl)
-}
-
-src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	emake $(use debug && echo fulltest || echo test)
-}
-
-src_install() {
-	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-	find "${ED}" -name "*.la" -exec rm -f {} +
-
-	doman sqlite3.1
-
-	if use doc; then
-		dohtml -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
-	fi
-}

dev-db/sqlite/sqlite-3.7.11.ebuild

@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.11.ebuild,v 1.2 2012/04/26 17:06:41 aballier Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
-# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
-DOC_PV="${SRC_PV}"
-
-DESCRIPTION="A SQL Database Engine in a C Library"
-HOMEPAGE="http://sqlite.org/"
-SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${DOC_PV}.zip )
-	tcl? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
-	!tcl? (
-		test? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
-		!test? ( http://sqlite.org/${PN}-autoconf-${SRC_PV}.tar.gz )
-	)"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
-
-RDEPEND="icu? ( dev-libs/icu )
-	readline? ( sys-libs/readline )
-	tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	tcl? ( app-arch/unzip )
-	test? (
-		app-arch/unzip
-		dev-lang/tcl
-	)"
-
-amalgamation() {
-	use !tcl && use !test
-}
-
-pkg_setup() {
-	if amalgamation; then
-		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
-	else
-		S="${WORKDIR}/${PN}-src-${SRC_PV}"
-	fi
-}
-
-src_prepare() {
-	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
-	use prefix && eautoreconf
-
-	epunt_cxx
-}
-
-src_configure() {
-	# `configure` from amalgamation tarball doesn't add -DSQLITE_DEBUG or -DNDEBUG flag.
-	if amalgamation; then
-		if use debug; then
-			append-cppflags -DSQLITE_DEBUG
-		else
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Support column metadata, bug #266651
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support R-trees, bug #257646
-	append-cppflags -DSQLITE_ENABLE_RTREE
-
-	if use icu; then
-		append-cppflags -DSQLITE_ENABLE_ICU
-		if amalgamation; then
-			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		else
-			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		fi
-	fi
-
-	# Support FTS3, bug #207701
-	if use fts3; then
-		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
-	fi
-
-	# Enable secure_delete pragma by default
-	if use secure-delete; then
-		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
-	fi
-
-	# Support soundex, bug #143794
-	if use soundex; then
-		append-cppflags -DSQLITE_SOUNDEX
-	fi
-
-	# Enable unlock notification
-	if use unlock-notify; then
-		append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-	fi
-
-	local extensions_option
-	if amalgamation; then
-		extensions_option="dynamic-extensions"
-	else
-		extensions_option="load-extension"
-	fi
-
-	# Starting from 3.6.23, SQLite has locking strategies that are specific to
-	# OSX. By default they are enabled, and use semantics that only make sense
-	# on OSX. However, they require gethostuuid() function for that, which is
-	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
-	# versions of OSX we have to disable all this nifty locking options, as
-	# suggested by upstream.
-	if [[ "${CHOST}" == *-darwin[56789] ]]; then
-		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
-	fi
-
-	if [[ "${CHOST}" == *-mint* ]]; then
-		append-cppflags -DSQLITE_OMIT_WAL
-	fi
-
-	# `configure` from amalgamation tarball doesn't support
-	# --with-readline-inc and --(enable|disable)-tcl options.
-	econf \
-		--disable-static \
-		$(use_enable extensions ${extensions_option}) \
-		$(use_enable readline) \
-		$(use_enable threadsafe) \
-		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
-		$(amalgamation || use_enable debug) \
-		$(amalgamation || echo --enable-tcl)
-}
-
-src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	emake $(use debug && echo fulltest || echo test)
-}
-
-src_install() {
-	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-	find "${ED}" -name "*.la" -exec rm -f {} +
-
-	doman sqlite3.1
-
-	if use doc; then
-		dohtml -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
-	fi
-}

dev-db/sqlite/sqlite-3.7.14.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/dev-db/sqlite/sqlite-3.7.12.ebuild,v 1.1 2012/05/15 01:04:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.14.ebuild,v 1.1 2012/09/05 16:26:13 floppym Exp $
 
 EAPI="4"
 
@@ -152,6 +152,7 @@ src_install() {
 	doman sqlite3.1
 
 	if use doc; then
-		dohtml -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+		find "${WORKDIR}/${PN}-doc-${DOC_PV}" -name ".[_~]*" -delete
+		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }

dev-lang/lua/lua-5.1.4-r4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r4.ebuild,v 1.11 2011/09/17 12:09:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r4.ebuild,v 1.12 2012/09/05 09:28:49 jlec Exp $
 
 EAPI="1"
 
@@ -93,8 +93,7 @@ src_install() {
 	dodoc HISTORY README
 	dohtml doc/*.html doc/*.gif
 
-	insinto /usr/share/pixmaps
-	doins etc/lua.ico
+	doicon etc/lua.ico
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins etc/lua.pc
 

dev-lang/lua/lua-5.1.4-r8.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/dev-lang/lua/lua-5.1.4-r8.ebuild,v 1.7 2012/08/15 01:36:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r8.ebuild,v 1.8 2012/09/05 09:28:49 jlec Exp $
 
 EAPI=4
 
@@ -94,8 +94,7 @@ src_install() {
 	dodoc HISTORY README
 	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
 
-	insinto /usr/share/pixmaps
-	doins etc/lua.ico
+	doicon etc/lua.ico
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins etc/lua.pc
 

dev-lang/lua/lua-5.1.5.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/dev-lang/lua/lua-5.1.5.ebuild,v 1.3 2012/05/29 15:04:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.5.ebuild,v 1.4 2012/09/05 09:28:49 jlec Exp $
 
 EAPI=4
 
@@ -95,8 +95,7 @@ src_install() {
 	dodoc HISTORY README
 	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
 
-	insinto /usr/share/pixmaps
-	doins etc/lua.ico
+	doicon etc/lua.ico
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins etc/lua.pc
 

dev-lisp/emacs-cl/emacs-cl-0_pre20060526.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/emacs-cl/emacs-cl-0_pre20060526.ebuild,v 1.2 2010/01/02 11:27:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/emacs-cl/emacs-cl-0_pre20060526.ebuild,v 1.3 2012/09/05 17:06:16 mr_bones_ Exp $
 
 #ECVS_SERVER="cvs.nocrew.org:/usr/local/cvsroot"
 #ECVS_MODULE="emacs-cl"
@@ -28,7 +28,7 @@ src_compile() {
 
 src_test() {
 	# "make check" clears all *.elc files, so move them to a safe location
-	mkdir safe || dir "mkdir failed"
+	mkdir safe || die "mkdir failed"
 	mv *.elc safe || die "mv failed"
 	emake -j1 check EMACSEN="${EMACS}" || die "emake check failed"
 	mv safe/*.elc . || die "mv failed"

dev-perl/Panotools-Script/Panotools-Script-0.270.0.ebuild

@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Panotools-Script/Panotools-Script-0.270.0.ebuild,v 1.1 2012/07/13 17:30:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Panotools-Script/Panotools-Script-0.270.0.ebuild,v 1.3 2012/09/05 07:25:53 tove Exp $
 
 EAPI=4
 
 MODULE_AUTHOR=BPOSTLE
 MODULE_VERSION=0.27
-inherit perl-module
+inherit eutils perl-module
 
 DESCRIPTION="A perl module for reading, writing, and manipulating hugin script files"
 
@@ -26,8 +26,7 @@ SRC_TEST="do"
 src_install() {
 	perl-module_src_install
 	if use gui ; then
-		insinto /usr/share/applications
-		doins "${S}"/desktop/*.desktop || die
+		domenu "${S}"/desktop/*.desktop || die
 	else
 		rm "${D}"/usr/bin/*-gui || die
 	fi

dev-php/PEAR-XML_Feed_Parser/Manifest

@@ -0,0 +1 @@
+DIST XML_Feed_Parser-1.0.5.tgz 264507 SHA256 7b30bee6ad076e3a597400834b1a446b90ca62671e882abf596ed9432b931aed SHA512 5c3a722fafbd172f89d3457c0439b4d4d3372437e0df33528fb686d9efd1c70e4220fa993c591adc20cf4bf6378e6bc3df3e9f5f1bf116b71ee411f40ea28373 WHIRLPOOL 9e80e2e608dbfb24807e70815853367051c37e536bdd5ae1582329947989ffc7f3e07ece7360b38ec6d35f23ca4cf93994fd3f77af97109af864b86764448ac9

dev-php/PEAR-XML_Feed_Parser/PEAR-XML_Feed_Parser-1.0.5.ebuild

@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Feed_Parser/PEAR-XML_Feed_Parser-1.0.5.ebuild,v 1.1 2012/09/05 18:43:03 lordvan Exp $
+
+inherit php-pear-r1
+
+DESCRIPTION="Provides an unified API for handling Atom/RSS"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""

dev-php/PEAR-XML_Feed_Parser/metadata.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>lordvan@gentoo.org</email>
+<!--  <description>Description of the maintainership</description> -->
+</maintainer>
+<longdescription>Provides an unified API for handling Atom/RSS</longdescription>
+</pkgmetadata>

dev-php/pecl-memcached/pecl-memcached-2.1.0-r1.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/pecl-memcached-2.1.0-r1.ebuild,v 1.1 2012/09/05 11:27:22 olemarkus Exp $
+
+EAPI="4"
+PHP_EXT_NAME="memcached"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="+session igbinary"
+
+DEPEND=">=dev-libs/libmemcached-1.0 sys-libs/zlib
+		dev-lang/php[session?]
+		igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	my_conf="--enable-memcached
+		--with-zlib-dir=/usr
+		$(use_enable session memcached-session)
+		$(use_enable igbinary memcached-igbinary)"
+
+	php-ext-source-r2_src_configure
+}

dev-python/wxpython/wxpython-2.8.12.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/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.15 2012/05/29 14:46:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.17 2012/09/05 09:36:33 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -104,11 +104,9 @@ src_install() {
 
 	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
 
-	insinto /usr/share/applications
-	doins "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
-	insinto /usr/share/pixmaps
-	newins "${S}"/wx/py/PyCrust_32.png PyCrust.png
-	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
+	domenu "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
+	newicon "${S}"/wx/py/PyCrust_32.png PyCrust.png
+	newicon "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
 
 	docdir=${D}usr/share/doc/${PF}
 

dev-python/wxpython/wxpython-2.9.3.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/dev-python/wxpython/wxpython-2.9.3.1.ebuild,v 1.3 2012/05/04 15:12:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.3.1.ebuild,v 1.5 2012/09/05 09:36:33 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -98,14 +98,12 @@ src_install() {
 
 	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
 
-	insinto /usr/share/applications
 	for x in {Py{AlaMode,Crust,Shell,Slices{,Shell}},XRCed}; do
-		newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
+		newmenu "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
 	done
-	insinto /usr/share/pixmaps
-	newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png
-	newins "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png
-	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
+	newicon "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png
+	newicon "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png
+	newicon "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
 
 	if use examples; then
 		dodir /usr/share/doc/${PF}/demo

dev-python/wxpython/wxpython-2.9.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/dev-python/wxpython/wxpython-2.9.4.1.ebuild,v 1.1 2012/07/28 22:56:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1.ebuild,v 1.3 2012/09/05 09:36:33 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -97,14 +97,12 @@ src_install() {
 
 	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
 
-	insinto /usr/share/applications
 	for x in {Py{AlaMode,Crust,Shell},XRCed}; do
-		newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
+		newmenu "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
 	done
-	insinto /usr/share/pixmaps
-	newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png
-	newins "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png
-	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
+	newicon "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png
+	newicon "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png
+	newicon "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
 
 	if use examples; then
 		dodir /usr/share/doc/${PF}/demo

dev-util/cccc/cccc-3.1.4.ebuild

@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/cccc-3.1.4.ebuild,v 1.6 2012/08/06 00:37:28 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/cccc-3.1.4.ebuild,v 1.7 2012/09/05 18:39:35 ssuominen Exp $
 
 EAPI=4
-
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A code counter for C and C++"
 HOMEPAGE="http://cccc.sourceforge.net/"
@@ -15,10 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+
 	sed -i -e "/^CFLAGS/s|=|+=|" pccts/antlr/makefile
 	sed -i -e "/^CFLAGS/s|=|+=|" pccts/dlg/makefile
 	sed -i -e "/^CFLAGS/s|=|+=|" \
@@ -28,8 +26,8 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CCC=$(tc-getCXX) LD=$(tc-getCXX) pccts
-	emake CCC=$(tc-getCXX) LD=$(tc-getCXX) cccc
+	emake CCC="$(tc-getCXX)" LD="$(tc-getCXX)" pccts
+	emake CCC="$(tc-getCXX)" LD="$(tc-getCXX)" cccc
 }
 
 src_install() {

dev-util/ddd/ddd-3.3.12-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r1.ebuild,v 1.7 2010/10/10 17:54:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r1.ebuild,v 1.8 2012/09/05 09:43:17 jlec Exp $
 
 EAPI=1
 
@@ -48,6 +48,5 @@ src_install() {
 	dodoc AUTHORS CREDITS INSTALL NEWS PROBLEMS README TIPS TODO
 	cp -R "${S}"/doc/* "${D}"/usr/share/doc/${PF}
 
-	insinto /usr/share/pixmaps
-	doins "${S}"/icons/ddd.xpm
+	doicon "${S}"/icons/ddd.xpm
 }

dev-util/ddd/ddd-3.3.12-r2.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r2.ebuild,v 1.7 2011/12/18 20:14:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r2.ebuild,v 1.8 2012/09/05 09:43:17 jlec Exp $
 
 EAPI="4"
 
-inherit autotools-utils
+inherit autotools-utils eutils
 
 DESCRIPTION="Graphical front-end for command-line debuggers"
 HOMEPAGE="http://www.gnu.org/software/ddd"
@@ -54,7 +54,7 @@ src_install() {
 	autotools-utils_src_install
 
 	# Install application icon
-	doicon "${S}"/icons/ddd.xpm || die "doicon failed"
+	doicon "${S}"/icons/ddd.xpm
 }
 
 pkg_postinst() {

dev-util/gquilt/gquilt-0.25.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gquilt/gquilt-0.25.ebuild,v 1.1 2011/04/25 20:11:55 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gquilt/gquilt-0.25.ebuild,v 1.2 2012/09/05 07:40:49 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -37,6 +37,5 @@ src_install() {
 
 	dobin ${PN} || die "dobin failed"
 
-	insinto /usr/share/applications
-	doins gquilt.desktop || die "doins failed"
+	domenu gquilt.desktop || die "doins failed"
 }

dev-util/helpblocks/helpblocks-1.21-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/helpblocks/helpblocks-1.21-r1.ebuild,v 1.2 2011/03/29 13:13:32 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/helpblocks/helpblocks-1.21-r1.ebuild,v 1.3 2012/09/05 07:42:44 jlec Exp $
 
 EAPI=1
 
@@ -33,7 +33,6 @@ src_install() {
 	for i in 32x32 48x48 128x128; do
 	    dosym /opt/helpblocks/appicons/helpblocks${i}.png /usr/share/icons/hicolor/${i}/apps/helpblocks.png
 	done
-	insinto /usr/share/applications
-	doins "${FILESDIR}/helpblocks.desktop"
+	domenu "${FILESDIR}/helpblocks.desktop"
 	newbin "${FILESDIR}/helpblocks.sh" helpblocks
 }

dev-util/molecule/Manifest

@@ -1,2 +1,3 @@
 DIST molecule-0.9.23.4.tar.bz2 272405 SHA256 77e48ebf34acdb8f98e92eba5256c170a7750ae6759d11c21e9afd62bf9ea9ef SHA512 4e3ed97464f7876f57457b585ed2a94a3250ea4de030cf1502d70cc5c3b63411419f1a7b3d0ff9f409121d9aadbe89256b167311161a23bd9f09cd993bb77997 WHIRLPOOL 5d20cb2c2e2434c18f218fbda8fcf7b8ea1808dc221f1ea3d6ad56ba3dadee0bd284ba404831f2a987c819c17079deb3c091ffc5973d7041446e68eca8f7bc7b
 DIST molecule-0.9.24.2.tar.bz2 273298 SHA256 cbe3b94d107be30dd1ef1368c15e6035a2427cf6fa5555bc3b5f7b3d466aed7b SHA512 5b6da33a4c082fb1cff25a2cde781fe88da28a5b4ba95be315c4571425978e84490a01774b741a2224c27877657bc6ae7e2614ade88278a5a5da54cdccfc64bd WHIRLPOOL de252e46891d163a38b22d4c6ebe2e5aa33675a240cb05caf607419acb19d6f0e52a2a73102847c4270e98262c9d870220c2788f191752dac4c5ab58176179a2
+DIST molecule-0.9.24.3.tar.bz2 273419 SHA256 9278b40a0073cd4d1cf9f7f63b0054c8429e2f92ac102c56c15b0a2cf46f8253 SHA512 da4fb918954e03956a1c4b77c1b431a8a3f7d12f00f067a1e014fc5bd20ac33bf57814084cf02e0c5dd8e77666a6750e7ab39aa9e1229d013d503244626d5b8d WHIRLPOOL 941b142064ce374f79490df02949ece6025b94799cf76e7a4172fec08649586f733967eacdb11b6dd7fb148f57679ff47e47df9168a30b8f6d6a82de2051a7d2

dev-util/molecule/molecule-0.9.24.3.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/molecule/molecule-0.9.24.3.ebuild,v 1.1 2012/09/05 11:56:53 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+
+inherit python
+
+DESCRIPTION="Release metatool used for creating Sabayon (and Gentoo) releases"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/intltool
+	sys-devel/gettext"
+RDEPEND="net-misc/rsync
+	sys-fs/squashfs-tools
+	sys-process/lsof
+	virtual/cdrtools"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
+		PREFIX="/usr" SYSCONFDIR="/etc" install \
+		|| die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/molecule"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/molecule"
+}

dev-util/redet/redet-8.26.ebuild

@@ -1,6 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/redet/redet-8.26.ebuild,v 1.1 2010/09/01 23:39:00 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/redet/redet-8.26.ebuild,v 1.2 2012/09/05 07:48:29 jlec Exp $
+
+EAPI=4
+
+inherit eutils
 
 DESCRIPTION="A regular expression development and execution tool"
 HOMEPAGE="http://www.billposer.org/Software/redet.html"
@@ -12,10 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/tcl-8.3
-	>=dev-lang/tk-8.3
+DEPEND="
+	dev-lang/tk
 	dev-tcltk/itk
 	dev-tcltk/iwidgets"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	einfo "Nothing to compile"
@@ -24,16 +29,18 @@ src_compile() {
 src_install() {
 	local MANUAL_PN=`echo ${PN} | cut -c 1 | tr [:lower:] [:upper:]``echo ${PN} | cut -c 2-`
 
-	newbin ${PN}.tcl ${PN} || die
+	newbin ${PN}.tcl ${PN}
 
-	insinto /usr/share/applications
-	doins ${PN}.desktop || die
+	sed \
+		-e "/Encoding/d" \
+		-i ${PN}.desktop || die
+	domenu ${PN}.desktop
 
 	doman ${PN}.1 || die
 	dodoc AUTHORS CREDITS README-General README-MacOSX \
 	 SampleClasses.utf8 \
 	 SampleCustomCharacterWidgetDefinition_Armenian \
 	 SampleCustomCharacterWidgetDefinition_Greek \
-	 SampleNewStyleDotRedetRC_Elaborate SampleNewStyleDotRedetRC_Simple || die
-	dosym doc/${P}/html /usr/share/${MANUAL_PN} || die
+	 SampleNewStyleDotRedetRC_Elaborate SampleNewStyleDotRedetRC_Simple
+	dosym doc/${P}/html /usr/share/${MANUAL_PN}
 }

dev-util/shc/Manifest

@@ -1 +1,2 @@
 DIST shc-3.8.7.tgz 20498 SHA256 d855a2638e2b9e76156e38ae9886acafa36d34a79182adfe641445f85a5f3086 SHA512 bafeb00da026f05dbf40373d144ad12c4453787a80de6ad8f264ecac4654f2cebbcfce0e7e6107c7e82b310bb419dc400da1ffb54429284f5a8a41126a004bf4 WHIRLPOOL 5eea35a844719077d89c730b56f825641dd400ead5688c88ffcbe8e99110839c09bb81b4e59270592cf6c57405c8a9aeb59fce9d9bbc6176d84ca4c1a22d9199
+DIST shc-3.8.9.tgz 20536 SHA256 ef7bbf1252c9c791f711782870d00d6f19c42c08e0ee57e9a04d0e2b3d114d40 SHA512 e8a4f9b0ef6e90fc99ebeeb0af36b89d1020209429c9651a036ab1f51a293d9faa3b775b7f040e91997b6ff5a487cb45943fc3548fa6fa3e7282e0d6f74d2cd4 WHIRLPOOL 07e0144fb58deeb205ea108ee79b451b1456351970f7a1e90cbe52bb7463578161c18a1a6028298309fba454456703a1df97a29ca6e56074695831ff8dc6488d

dev-util/shc/metadata.xml

@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+	<email>pinkbyte@gentoo.org</email>
+	<name>Sergey Popov</name>
 </maintainer>
+<upstream>
+	<changelog>http://www.datsi.fi.upm.es/~frosal/sources/CHANGES</changelog>
+</upstream>
 </pkgmetadata>

dev-util/shc/shc-3.8.9.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shc/shc-3.8.9.ebuild,v 1.1 2012/09/05 18:07:11 pinkbyte Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A (shell-) script compiler/scrambler"
+HOMEPAGE="http://www.datsi.fi.upm.es/~frosal"
+SRC_URI="http://www.datsi.fi.upm.es/~frosal/sources/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	# respect LDFLAGS
+	sed -i makefile -e 's:$(CC) $(CFLAGS):& $(LDFLAGS):' || die
+	# fix source file name wrt bug #433970
+	mv {${P},${PN}}.c || die
+}
+
+src_compile() {
+	## the "test"-target leads to an access-violation -> so we skip it
+	## as it's only for demonstration purposes anyway.
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" shc
+}
+
+src_install() {
+	dobin shc
+	doman shc.1
+	newdoc shc.README README
+	dodoc CHANGES
+}

dev-util/spe/spe-0.8.4h.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/dev-util/spe/spe-0.8.4h.ebuild,v 1.5 2012/07/08 15:27:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/spe/spe-0.8.4h.ebuild,v 1.6 2012/09/05 07:43:56 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -34,6 +34,5 @@ src_install() {
 
 	doicon _spe/images/spe.png
 
-	insinto /usr/share/applications
-	doins spe.desktop
+	domenu spe.desktop
 }

dev-util/visual-regexp/files/visualregexp.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Exec=visualregexp
-Icon=/usr/share/pixmaps/visualregexp/visualregexp-icon.png
+Icon=visualregexp-icon
 Name=Visual Regexp
 Comment=An interactive regular expression editor
 Categories=Development;

dev-util/visual-regexp/visual-regexp-3.0.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/visual-regexp-3.0.ebuild,v 1.8 2011/06/13 12:03:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/visual-regexp-3.0.ebuild,v 1.9 2012/09/05 09:45:09 jlec Exp $
 
 EAPI=4
 
@@ -31,10 +31,9 @@ src_install() {
 
 	newbin visual_regexp.tcl visualregexp
 
-	dosym /usr/bin/visualregexp /usr/bin/tkregexp
+	dosym visualregexp /usr/bin/tkregexp
 
-	insinto /usr/share/pixmaps/visualregexp
-	doins "${WORKDIR}"/visualregexp-icon.png
+	doicon "${WORKDIR}"/visualregexp-icon.png
 
 	domenu "${FILESDIR}"/visualregexp.desktop
 }

dev-util/wxglade/wxglade-0.6.3-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.3-r1.ebuild,v 1.5 2011/03/27 20:11:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.3-r1.ebuild,v 1.6 2012/09/05 09:49:30 jlec Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2:2.5"
@@ -35,8 +35,7 @@ src_compile() {
 
 src_install() {
 	dodoc CHANGES.txt README.txt TODO.txt
-	insinto /usr/share/pixmaps
-	newins icons/icon.xpm wxglade.xpm || die "installing wxglade.xpm failed"
+	newicon icons/icon.xpm wxglade.xpm || die "installing wxglade.xpm failed"
 	doman "${S}"/debian/wxglade.1 || die "installing man failed"
 	rm -rf "${S}"/debian
 	dohtml -r "${S}"/docs/* || die "installing docs failied"

dev-util/xdelta/Manifest

@@ -1,2 +1,3 @@
 DIST xdelta-1.1.4.tar.gz 423529 SHA256 345503b60432812840991ea1d79cb10db5f34bfaba9499bd0e7d5c57ac5d5c6d SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b WHIRLPOOL 246d7b50ef528e0a761e334fb9c0af06028364ba6851aee4de0a11db42ae25fbecbf4f603e0a01f3daa5d89caecc549deea79f795af08925bdac282103056150
+DIST xdelta3-3.0.4.tar.gz 481462 SHA256 53caa1e8be648b6d3d6b305dd9f1a4b27ded9c70c78d18b2c8857eceae46e46e SHA512 b044cf97f66ef20d34a02896fc758bd3da9d3e7125fc66175a622aa4485b2d224a34497095b58fc0b0aed4cdfa6d42737b6b18d2c214fd4be098f4b78cb61b7b WHIRLPOOL 02ea07c6a39dfdf9f9bd4a715534bc48c9d2eb9f5d06d0fdb72d2005e7aad057182d54927e3079968b11e1b3a29870b36af5518923bc8fe6e7fd7bb8ec36bc90
 DIST xdelta3.0.0.tar.gz 282201 SHA256 dfe61aac8d6ab301be2f3aed561d15f95f30a270e25d179f7cf0bde010ada102 SHA512 76ea4cba6894d919e336d7fe7fbabb5149c68dc810fc5b5a5752d98678351126769df6abfe27915cb70fe7470d167746ebe7f137d040de4dd8db99e19d8753ff WHIRLPOOL 3820c5aba7bb6672fa8c4faa232da34f1a24f9dc97e15ff18c75d0e4a6d37b27ce515c245c1e45dc1ac840035980a4f21c021971d8ffb30830d1adbca66687ea

dev-util/xdelta/xdelta-3.0.0.ebuild

@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0.0.ebuild,v 1.8 2011/07/15 15:39:51 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-inherit distutils toolchain-funcs
-
-DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression."
-HOMEPAGE="http://xdelta.org"
-SRC_URI="http://${PN}.googlecode.com/files/${P/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-DEPEND="test? ( app-arch/ncompress )"
-RDEPEND=""
-
-S="${WORKDIR}/${P/-}"
-
-DOCS="draft-korn-vcdiff.txt"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-O3:-Wall:' setup.py || die "setup.py sed failed"
-	sed \
-		-e 's:-O3::g' \
-		-e 's:$(CC):$(CC) $(LDFLAGS):g' \
-		-e 's:CFLAGS=:CFLAGS+=:' \
-		-i Makefile || die "Makefile sed failed"
-}
-
-src_test() {
-	if [ $UID != 0 ]; then
-		emake test || die "emake test failed"
-	else
-		ewarn "Tests can't be run as root, skipping."
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX
-	distutils_src_compile
-	emake xdelta3 || die "emake xdelta3 failed"
-	if use test; then
-		emake xdelta3-debug || die "emake xdelta3-debug failed"
-	fi
-}
-
-src_install() {
-	dobin xdelta3 || die "dobin failed"
-	distutils_src_install
-}

dev-util/xdelta/xdelta-3.0.4.ebuild

@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0.4.ebuild,v 1.3 2012/09/05 18:16:43 ssuominen Exp $
+
+EAPI=4
+
+inherit autotools python
+
+MY_P=${PN}${PV%.*.*}-${PV}
+
+DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression."
+HOMEPAGE="http://xdelta.org/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples test"
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}
+	test? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use test; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	>py-compile
+
+	# huh
+	sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die
+	sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die
+
+	# only build tests when required
+	sed -i -e '/xdelta3regtest/s:noinst_P:check_P:' Makefile.am || die
+	eautoreconf
+}
+
+src_test() {
+	default
+	./xdelta3regtest || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc draft-korn-vcdiff.txt README
+	use examples && dodoc -r examples
+}

games-action/bomberclone/Manifest

@@ -1 +1 @@
-DIST bomberclone-0.11.8.tar.bz2 7966452 RMD160 aaac2d55dd00626bf958dfa64b73f118b826664d SHA1 a900b716683f9267bfd28d9687049e1f65335f95 SHA256 2f6993ee4a63e8cea51f9605e35de4b4ec12a5abafd25309c313ddb0fba35230
+DIST bomberclone-0.11.8.tar.bz2 7966452 SHA256 2f6993ee4a63e8cea51f9605e35de4b4ec12a5abafd25309c313ddb0fba35230 SHA512 a5e52db43f7f508993231ec13bb2705f60e25cfc21d15c17d9b422c6fc948dc14cc8c4519acfac2e9b7b32a3072dc3a521fbf28b2150a86cfb4099ced72ab79b WHIRLPOOL 89ecc1ce9f18342ea0bf4cb099e26eed8dc2ebddf71c75356f522a0a2b5d593d1525234c104d441f4d3073efb01e78fe234b0a7aabb81baa236df6c5133084c4

games-action/bomberclone/bomberclone-0.11.8.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bomberclone/bomberclone-0.11.8.ebuild,v 1.8 2011/06/18 16:30:09 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bomberclone/bomberclone-0.11.8.ebuild,v 1.9 2012/09/05 07:44:06 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -16,7 +16,7 @@ IUSE="X"
 
 DEPEND=">=media-libs/libsdl-1.1.0
 	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mikmod]
+	media-libs/sdl-mixer[mod]
 	X? ( x11-libs/libXt )"
 
 src_prepare() {
@@ -33,14 +33,14 @@ src_configure() {
 	sed -i \
 		-e "/PACKAGE_DATA_DIR/ s:/usr/games/share/games/:${GAMES_DATADIR}/:" \
 		config.h \
-		|| die "sed config.h failed"
+		|| die
 }
 
 src_install() {
-	dogamesbin src/${PN} || die "dogamesbin failed"
+	dogamesbin src/${PN} || die
 
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data/{gfx,maps,player,tileset,music} || die "doins failed"
+	doins -r data/{gfx,maps,player,tileset,music} || die
 	find "${D}" -name "Makefile*" -exec rm -f '{}' +
 
 	dodoc AUTHORS ChangeLog README TODO

games-arcade/circuslinux/Manifest

@@ -1 +1 @@
-DIST circuslinux-1.0.3.tar.gz 1253839 RMD160 5483132e043b4a251a6e731856d822fc731a9ead SHA1 88b7cc95f2b759cc1e46d22a51e0ff7714331fec SHA256 bf9550ebd598a9e7d93a20d80ff466475122f8b023314bb1e07c31e8c608ce8a
+DIST circuslinux-1.0.3.tar.gz 1253839 SHA256 bf9550ebd598a9e7d93a20d80ff466475122f8b023314bb1e07c31e8c608ce8a SHA512 292bcaad39342ad69862f1add36b11505ca5f2601637a8db6fad438c5a4b32d7801bc7e6c08b903b0fb8bf68dcb3ec8d968fb913cde65941b9b9ac64b5a5266f WHIRLPOOL 735d87965107297f139971bcdcb5bb10bd996f5a355062c207f656c65089b305eb96bfc1c76a9a1c61a9a1a0d092ab386b8fc87b359470e8eec58fe9925fe4a3

games-arcade/circuslinux/circuslinux-1.0.3.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/circuslinux/circuslinux-1.0.3.ebuild,v 1.17 2009/01/12 15:37:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/circuslinux/circuslinux-1.0.3.ebuild,v 1.18 2012/09/05 07:21:02 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -16,21 +16,21 @@ IUSE=""
 
 DEPEND="media-libs/libsdl
 	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mikmod]"
+	media-libs/sdl-mixer[mod]"
 
 src_prepare() {
 	sed -i \
 		-e "/^install-data-am/d" \
 		Makefile.in \
-		|| die "sed failed"
+		|| die
 	sed -i \
 		-e 's/\$(pkgdatadir)/$(DESTDIR)&/' \
 		data/Makefile.in \
-		|| die "sed failed"
+		|| die
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	newicon data/images/${PN}-icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Circus Linux!"
 	dodoc *.txt

games-arcade/criticalmass/Manifest

@@ -1,2 +1 @@
-DIST CriticalMass-1.0.0.tar.bz2 5092549 RMD160 33c7b60f1cb3cf6e887fe4bbc99928b17f97c047 SHA1 ce0de4fa9259f0586f8dfa7ee96978da21e57335 SHA256 94cedac39f9279faa63f6ce4098f2a778a8c8f9013ba8dd7d5b85766739e0858
-DIST CriticalMass-1.0.2.tar.bz2 5122126 RMD160 6c0b6988f6a52c4b19fbca2525b1daec0202693d SHA1 d2d1f35183e9fbed76fd8da2a948745a4c89f20b SHA256 846db2d30d39e559612328594084a7aef980169948b2cfaee9fddec8ffdef724
+DIST CriticalMass-1.0.2.tar.bz2 5122126 SHA256 846db2d30d39e559612328594084a7aef980169948b2cfaee9fddec8ffdef724