clean up

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

3 files changed, 54 insertions, 48 deletions

diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 4a7b272c9f1b..85644c40a096 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -6,7 +6,7 @@ DIST pcmanfm-0.9.8.tar.gz 496997 RMD160 4340c007ccb47c3719ebb8531d72a02a0fb2bbab
 EBUILD pcmanfm-0.5.2.ebuild 1738 RMD160 d9423da434aa22593e3223c7691f480b69415ffe SHA1 7ab8616de69e48df917ffef8f84f17fb37a9fd0d SHA256 7143f3d3245d637889fe77be2497bd7761ee7a6762890cfc2a356bcd66be17c9
 EBUILD pcmanfm-0.9.7-r1.ebuild 1225 RMD160 522d0b25efca62cac00ee21a580d5394935cac91 SHA1 7278b2bf05dbb4c8482026c0ab77f498ffb36171 SHA256 f36e297a97692ad72b2d20ebe94ff0722f1a53f4dcdba1a4b4ff1a863c4bf76e
 EBUILD pcmanfm-0.9.7-r2.ebuild 1202 RMD160 e0d99ef1bdfedd04f9dc3f04c59ebc2735b4cfd4 SHA1 8f80bad930232d38250ad50d85dea313af0b7d7b SHA256 ef21f77725542660e1ab0fcfa09f7c8c5575e3389db37aa70e6516bb5fb5696b
-EBUILD pcmanfm-0.9.8.ebuild 1456 RMD160 a6bbb1319b459487d489b92a5864c0f47519b0b4 SHA1 9ce58eb3ab98c286e3b43f5dbaadbdbc43a51ce0 SHA256 3d276e1799d902c9a718f0dab8261b1f25320795d923a9167bbdf00b5eea0bf0
-EBUILD pcmanfm-9999.ebuild 1452 RMD160 fc06a38ef70491bb26bb16ea674195855761be75 SHA1 7d8d06a12d6548c00e5e3321122e353b38f09bb4 SHA256 943db0275ec175741b60e560995884b123e9afb139cf1fa5765faaae1c053698
+EBUILD pcmanfm-0.9.8.ebuild 1376 RMD160 11c892b6022e005c23f745d828c21505b3d4d7fd SHA1 b52d8064c8d1cd4aaf97aba35c2cdfe1b94f91d7 SHA256 eb1de875bc2f179aefbbcb22e4b0551ccb7d2e13dbbbbe2060c319cd507a4fcf
+EBUILD pcmanfm-9999.ebuild 1375 RMD160 3d4358b74e943058f445f66a950a7800db46ab20 SHA1 19d905136abbf7407cbd3be3632f51e0c5c44ebf SHA256 104f50def44b3c8210ad7998bb9814c68f7e154c391a65f7332bc90817b62ada
 MISC ChangeLog 6566 RMD160 0729bb3184592535fd35b0889ad930fbe6e02913 SHA1 995dfa29557f52f7b4a3e11227dd635612d37657 SHA256 66c6ae836a1501b59edd57e77259f54d11c7d4f243f46926d9542b374ddd8e28
 MISC metadata.xml 367 RMD160 10b5e212596c6d270b537a2e923b27f31d7a0d5d SHA1 d9a8a0420ea3532a943269a6156e85c68ca36081 SHA256 fd9514402db65161adb35eea1ca3f8a6cf5dc581bcb2b447f74d1d9014ee47bc
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
 }