Bump to 1.4

(Portage version: 2.1.6.13/cvs/Linux i686)

5 files changed, 184 insertions, 2 deletions

diff --git a/app-admin/smolt/ChangeLog b/app-admin/smolt/ChangeLog
index 035bc612c300..48001c78ea49 100644
--- a/app-admin/smolt/ChangeLog
+++ b/app-admin/smolt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/smolt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/smolt/ChangeLog,v 1.3 2009/04/22 20:22:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/smolt/ChangeLog,v 1.4 2009/10/02 20:09:32 sping Exp $
+
+*smolt-1.4 (02 Oct 2009)
+
+  02 Oct 2009; Sebastian Pipping <sping@gentoo.org> +smolt-1.4.ebuild,
+  +files/smolt-1.4-upstream-docdir.patch,
+  +files/smolt-1.4-upstream-fix-gzip-calls.patch, metadata.xml:
+  Bump to version 1.4 (now qt4, gtk before), upgrade to EAPI 2, fix license
+  (GPL 2 or later), add more ' die' stuff. First commit to the tree ever,
+  don't shoot me please :-)
 
   22 Apr 2009; Markus Meier <maekke@gentoo.org> smolt-1.2:
   add ~amd64, bug #264012
diff --git a/app-admin/smolt/files/smolt-1.4-upstream-docdir.patch b/app-admin/smolt/files/smolt-1.4-upstream-docdir.patch
new file mode 100644
index 000000000000..2da0d87cf933
--- /dev/null
+++ b/app-admin/smolt/files/smolt-1.4-upstream-docdir.patch
@@ -0,0 +1,62 @@
+From a2b22db69af0d2cce2f64f78e654d26242a3d712 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 2 Oct 2009 21:13:18 +0200
+Subject: [PATCH 2/2] Client: Allow overriding DOCDIR and MANDIR
+
+---
+ client/Makefile |   24 ++++++++++++++++++------
+ 1 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/client/Makefile b/client/Makefile
+index 86902d5..0d0f4fb 100644
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -17,6 +17,18 @@ PREFIX=$(DESTDIR)/usr
+ BINDIR=$(PREFIX)/bin
+ DATADIR=$(PREFIX)/share
+ 
++ifndef DOCDIR
++_DOCDIR=$(DATADIR)/$(NAME)/doc
++else
++_DOCDIR=$(DESTDIR)/$(DOCDIR)
++endif
++
++ifndef MANDIR
++_MANDIR=$(DATADIR)/man
++else
++_MANDIR=$(DESTDIR)/$(MANDIR)
++endif
++
+ all: po/smolt.pot $(MO_FILES)
+ 
+ po/smolt.pot: $(PY_FILES)
+@@ -33,7 +45,7 @@ install-main: move-mo
+ 	mkdir -p $(ETC)/smolt/
+ 	mkdir -p $(BINDIR)/
+ 	mkdir -p $(DATADIR)/locale/
+-	mkdir -p $(DATADIR)/man/man1
++	mkdir -p $(_MANDIR)/man1
+ 	
+ 	cp -advr mo/* $(DATADIR)/locale/ 
+ 	cp -advr config.py $(SMOLTCONFIGDIR)
+@@ -56,12 +68,12 @@ install-main: move-mo
+ 	cp ./icons/smolt-icon-24.png $(DATADIR)/icons/hicolor/24x24/apps/smolt.png
+ 	cp ./icons/smolt-icon-32.png $(DATADIR)/icons/hicolor/32x32/apps/smolt.png
+ 	
+-	mkdir -p $(DATADIR)/$(NAME)/doc
+-	install -p -m 0644 ../doc/PrivacyPolicy $(DATADIR)/$(NAME)/doc
++	mkdir -p $(_DOCDIR)
++	install -p -m 0644 ../doc/PrivacyPolicy $(_DOCDIR)
+ 	
+-	gzip -c -9 man/smoltSendProfile.1 > $(DATADIR)/man/man1/smoltSendProfile.1.gz
+-	gzip -c -9 man/smoltDeleteProfile.1 > $(DATADIR)/man/man1/smoltDeleteProfile.1.gz
+-	gzip -c -9 man/smoltGui.1 > $(DATADIR)/man/man1/smoltGui.1.gz
++	gzip -c -9 man/smoltSendProfile.1 > $(_MANDIR)/man1/smoltSendProfile.1.gz
++	gzip -c -9 man/smoltDeleteProfile.1 > $(_MANDIR)/man1/smoltDeleteProfile.1.gz
++	gzip -c -9 man/smoltGui.1 > $(_MANDIR)/man1/smoltGui.1.gz
+ 	
+ 	ln -sf $(DATADIR)/$(NAME)/client/sendProfile.py $(BINDIR)/smoltSendProfile
+ 	ln -sf $(DATADIR)/$(NAME)/client/deleteProfile.py $(BINDIR)/smoltDeleteProfile
+-- 
+1.6.4.4
+
diff --git a/app-admin/smolt/files/smolt-1.4-upstream-fix-gzip-calls.patch b/app-admin/smolt/files/smolt-1.4-upstream-fix-gzip-calls.patch
new file mode 100644
index 000000000000..494094c11de0
--- /dev/null
+++ b/app-admin/smolt/files/smolt-1.4-upstream-fix-gzip-calls.patch
@@ -0,0 +1,29 @@
+From 420c736a2bbc5f504e33a1aa16ae61c70b2c3ee2 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 2 Oct 2009 21:07:11 +0200
+Subject: [PATCH 1/2] Client: Fix calls to gzip in Makefile
+
+---
+ client/Makefile |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/client/Makefile b/client/Makefile
+index ec47021..86902d5 100644
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -59,9 +59,9 @@ install-main: move-mo
+ 	mkdir -p $(DATADIR)/$(NAME)/doc
+ 	install -p -m 0644 ../doc/PrivacyPolicy $(DATADIR)/$(NAME)/doc
+ 	
+-	gzip -9 man/smoltSendProfile.1 > $(DATADIR)/man/man1/smoltSendProfile.1.gz
+-	gzip -9 man/smoltDeleteProfile.1 > $(DATADIR)/man/man1/smoltDeleteProfile.1.gz
+-	gzip -9 man/smoltGui.1 > $(DATADIR)/man/man1/smoltGui.1.gz
++	gzip -c -9 man/smoltSendProfile.1 > $(DATADIR)/man/man1/smoltSendProfile.1.gz
++	gzip -c -9 man/smoltDeleteProfile.1 > $(DATADIR)/man/man1/smoltDeleteProfile.1.gz
++	gzip -c -9 man/smoltGui.1 > $(DATADIR)/man/man1/smoltGui.1.gz
+ 	
+ 	ln -sf $(DATADIR)/$(NAME)/client/sendProfile.py $(BINDIR)/smoltSendProfile
+ 	ln -sf $(DATADIR)/$(NAME)/client/deleteProfile.py $(BINDIR)/smoltDeleteProfile
+-- 
+1.6.4.4
+
diff --git a/app-admin/smolt/metadata.xml b/app-admin/smolt/metadata.xml
index ad5cc7d1f12e..433879532082 100644
--- a/app-admin/smolt/metadata.xml
+++ b/app-admin/smolt/metadata.xml
@@ -3,7 +3,10 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>bangert@gentoo.org</email>
+	<email>bangert@gentoo.org</email>
+</maintainer>
+<maintainer>
+	<email>sping@gentoo.org</email>
 </maintainer>
 <longdescription lang="en">
 Smolt is a basic hardware profiler. Its intended to be a profiler to get automated information from users. 
diff --git a/app-admin/smolt/smolt-1.4.ebuild b/app-admin/smolt/smolt-1.4.ebuild
new file mode 100644
index 000000000000..ddb8f7825107
--- /dev/null
+++ b/app-admin/smolt/smolt-1.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/smolt/smolt-1.4.ebuild,v 1.1 2009/10/02 20:09:32 sping Exp $
+
+EAPI="2"
+
+inherit python eutils
+
+DESCRIPTION="The Fedora hardware profiler"
+HOMEPAGE="https://fedorahosted.org/smolt/"
+SRC_URI="https://fedorahosted.org/releases/s/m/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4"
+
+DEPEND="virtual/python
+	sys-devel/gettext"
+
+RDEPEND="${DEPEND}
+	sys-apps/hal
+	>=dev-python/rhpl-0.213
+	>=dev-python/urlgrabber-3.0.0
+	>=dev-python/simplejson-1.7.1
+	dev-python/dbus-python
+	qt4? ( dev-python/PyQt4 )"
+
+S="${S}/client"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4-upstream-{fix-gzip-calls,docdir}.patch
+}
+
+src_install() {
+	emake install DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" \
+		|| die "Install failed"
+
+	if ! use qt4; then
+		rm "${D}"/usr/bin/smoltGui \
+				"${D}"/usr/share/smolt/client/{gui,smoltGui}.py \
+				"${D}"/usr/share/applications/smolt.desktop \
+				"${D}"/usr/share/man/man1/smoltGui.1.* \
+			|| die "rm failed"
+		rmdir "${D}"/usr/share/applications || die "rmdir failed"
+	fi
+
+	bzip2 -9 "${D}"/usr/share/doc/${PF}/PrivacyPolicy || die "bzip2 failed"
+	dodoc ../README ../TODO || die "dodoc failed"
+
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN} || die "newinitd failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}"/usr/share/${PN}
+
+	if ! [ -f "${ROOT}"/etc/smolt/hw-uuid ]; then
+		elog "Creating this machines UUID in ${ROOT}/etc/smolt/hw-uuid"
+		cat /proc/sys/kernel/random/uuid > "${ROOT}"/etc/smolt/hw-uuid
+		UUID=$(cat "${ROOT}"/etc/smolt/hw-uuid)
+		elog "Your UUID is: ${UUID}"
+	fi
+	echo
+	elog "Call smoltSendProfile as root in order to initialize your profile."
+	echo
+	elog "You can withdraw it from the server if you wish to with"
+	elog "   smoltDeleteProfile any time later on."
+	echo
+
+	if use qt4 && has_version "<virtual/python-2.5"; then
+		elog "If you want to view your profile on the web from within smoltGui,"
+		elog "you should have a link mozilla-firefox -> firefox in your path."
+		echo
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}