clean up

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

2 files changed, 52 insertions, 46 deletions

diff --git a/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild b/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild
index b3ed798f2d91..ff4eaa6e64f3 100644
--- a/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild
@@ -1,54 +1,58 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild,v 1.2 2010/12/26 00:16:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild,v 1.3 2010/12/26 04:59:43 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 
-inherit autotools eutils fdo-mime
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
+	inherit autotools git
+	SRC_URI=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+inherit fdo-mime
 
 DESCRIPTION="Fast lightweight tabbed filemanager"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug"
 
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	lxde-base/menu-cache
-	x11-misc/shared-mime-info
-	>=x11-libs/libfm-0.1.14
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2
+	>=x11-libs/libfm-0.1.10"
+RDEPEND="${COMMON_DEPEND}
 	virtual/eject"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
 src_prepare() {
-	# add missing files to traslation file. Fixes tests
-	for i in about.ui autorun.ui desktop-pref.ui pref.ui; do
-		echo "data/ui/${i}" >> po/POTFILES.in
-	done
-	eautoreconf
-	einfo "Running intltoolize ..."
-	intltoolize --force --copy --automake || die
-	strip-linguas -i "${S}/po"
+	if [[ ${PV} == 9999 ]]; then
+		intltoolize --force --copy --automake || die
+		eautoreconf
+	fi
 }
 
 src_configure() {
-	econf --sysconfdir=/etc $(use_enable debug)
+	econf \
+		--sysconfdir=/etc \
+		$(use_enable debug)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS || die
+	dodoc AUTHORS
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 
 	elog 'PCmanFM can optionally support the menu://applications/ location.'
 	elog 'You should install lxde-base/lxmenu-data for that	functionality.'
@@ -56,5 +60,4 @@ pkg_postinst() {
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 }
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
index bc575fc965df..d7d73c36683e 100644
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
@@ -1,54 +1,58 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-9999.ebuild,v 1.6 2010/12/26 00:16:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-9999.ebuild,v 1.7 2010/12/26 04:59:43 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 
-inherit autotools eutils fdo-mime git
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
+	inherit autotools git
+	SRC_URI=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+inherit fdo-mime
 
 DESCRIPTION="Fast lightweight tabbed filemanager"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
-EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug"
 
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	lxde-base/menu-cache
-	x11-misc/shared-mime-info
-	x11-libs/libfm
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2
+	>=x11-libs/libfm-0.1.15"
+RDEPEND="${COMMON_DEPEND}
 	virtual/eject"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
 src_prepare() {
-	# add missing files to traslation file. Fixes tests
-	for i in about.ui autorun.ui desktop-pref.ui pref.ui; do
-		echo "data/ui/${i}" >> po/POTFILES.in
-	done
-	eautoreconf
-	einfo "Running intltoolize ..."
-	intltoolize --force --copy --automake || die
-	strip-linguas -i "${S}/po"
+	if [[ ${PV} == 9999 ]]; then
+		intltoolize --force --copy --automake || die
+		eautoreconf
+	fi
 }
 
 src_configure() {
-	econf --sysconfdir=/etc $(use_enable debug)
+	econf \
+		--sysconfdir=/etc \
+		$(use_enable debug)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS || die
+	dodoc AUTHORS
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 
 	elog 'PCmanFM can optionally support the menu://applications/ location.'
 	elog 'You should install lxde-base/lxmenu-data for that	functionality.'
@@ -56,5 +60,4 @@ pkg_postinst() {
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 }