app-admin/smolt: Bump to 1.4.3 (bug #313423)

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

6 files changed, 170 insertions, 12 deletions

diff --git a/app-admin/smolt/ChangeLog b/app-admin/smolt/ChangeLog
index 59cca89bc33d..dff53c0c6cbe 100644
--- a/app-admin/smolt/ChangeLog
+++ b/app-admin/smolt/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/smolt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/smolt/ChangeLog,v 1.6 2011/04/05 05:11:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/smolt/ChangeLog,v 1.7 2011/04/10 18:35:08 sping Exp $
+
+*smolt-1.4.3 (10 Apr 2011)
+
+  10 Apr 2011; Sebastian Pipping <sping@gentoo.org> +smolt-1.4.3.ebuild,
+  +files/smolt-1.4.3-disable-distro-data.patch,
+  +files/smolt-1.4.3-hwdata-dir.patch,
+  +files/smolt-1.4.3-makefile-py-files.patch:
+  Bump to 1.4.3 which is using udev, not HAL. Add dependencies udev, usbutils,
+  pciutils, sed. Collection of gentoo-specific data is disabled until the
+  server machine can actually handle such data. Many thanks to Alexandre
+  Rostovtsev for research and patches. (bug #313423)
 
   05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> smolt-1.2.ebuild,
   smolt-1.4.ebuild, smolt-1.4.2.ebuild:
diff --git a/app-admin/smolt/Manifest b/app-admin/smolt/Manifest
index 4de8279a4e3d..098165fcc407 100644
--- a/app-admin/smolt/Manifest
+++ b/app-admin/smolt/Manifest
@@ -1,23 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX smolt-1.2-Makefile-fix-install.patch 1757 RMD160 88a88cc2ee2c73ccf7c1afd38c8c609cc187083b SHA1 1b7791b5561bad7141734841f8669e3248356f78 SHA256 64ed1eb6c75108b2f853d63e06823b76d6dee604a64478cfbc1f30c4fdc7db25
 AUX smolt-1.2-config.py-gentoo-config.patch 2959 RMD160 b8499c70643a1abc1b78b6a35072d60b757dc801 SHA1 55e8fb50cee0b8922baf06e35faa995b846d9d14 SHA256 efaf98df462d61b0d084ec398dedc8119aaa72b9f1d8b4b3d8a2d2e6f3299935
 AUX smolt-1.4-upstream-docdir.patch 2020 RMD160 65444a436a1d3a34c865eb112a8b3261ea797e61 SHA1 43be8402b1aaa6c274a9f6bb414f446a231adc9a SHA256 e283d9a5442901a92e860fdc9ce83cd4029c3de5436994daadf610cf9d5d22c4
 AUX smolt-1.4-upstream-fix-gzip-calls.patch 1186 RMD160 50adf2f4c86f91f77e35a67f5156e713489cc560 SHA1 b4f9976ce515427acb8afa30f14a03da780d8ed2 SHA256 73547259716351e3960874fb69d1b0ab6cf1e5192a58abffb5250620e96b695d
+AUX smolt-1.4.3-disable-distro-data.patch 417 RMD160 36b8f4611d31cb352a0cb86e0c095a9e018fc00e SHA1 5379fcf47efeba2597542b8a678562c3e0d00e72 SHA256 dbbf048ec65d77e42577aeed3c78d87cf328b90e90f1e83d601542631de16e76
+AUX smolt-1.4.3-hwdata-dir.patch 731 RMD160 c66ed56350752235e3c993576271c05a3c49600b SHA1 5a192d805e10401067dfe26547dafe10d2e88bc9 SHA256 5664da9ff8dd0963746a16f3df2cda780df57e0ec74e00d0718188610595fd2c
+AUX smolt-1.4.3-makefile-py-files.patch 1327 RMD160 3105a9754916711e0daf89c26a28ddf05273f12e SHA1 bcf289e4cb3566e7c8004c6f98212907ec2dce7e SHA256 e9e41af2435c0de39cb3fa743851d139660675e1773f413787d174f91b1e6a59
 AUX smolt-init.d 744 RMD160 698454d784174cda03849030d469b64042a51f7e SHA1 204b6c45f2e05a4a5d183fca7e3dd499abab9994 SHA256 fcb6f0b05b8608123a995f131984de6b559a9f35f2c1e74e573c0ee00dc07d76
 DIST smolt-1.2.tar.gz 646738 RMD160 f3fcd02dde5051eddac528eddc7637fb595fc9d0 SHA1 57c9d0fb9d6adee6508f655688aac7aa3467938b SHA256 477c0972ef9433e9e8ea18bb846ccefd7bb2c7e4d6efdc1eb979228a69295944
 DIST smolt-1.4.2.tar.gz 765014 RMD160 721021f204bf3d2a4c508567620e8d81c3f7a1bc SHA1 1ed7736b7789d03e9bd70326c48535ceb7069c65 SHA256 71198a17c5d320c7e871cdd6be28d922ef8f06313974156fccdf993e21592e55
+DIST smolt-1.4.3.tar.gz 865409 RMD160 0af0042c06927b35df110baa99b24637b4775de5 SHA1 f3d683662437013d7778df1092da16d1eda607be SHA256 8fc47b94b9342012b5d50d2c5802cbb62777c6f0e876ba2e6845761c197ead53
 DIST smolt-1.4.tar.gz 752848 RMD160 44a998004317fd4e23edd1fe99f6498bd735b033 SHA1 dbbee35d9200190f2ed7abe8b0b15515923b6934 SHA256 26a173f28ab93184a1fe7f57f3c44c4f6012c8aee929456cdfa6b12d10e7437b
 EBUILD smolt-1.2.ebuild 2161 RMD160 77cb0f0f57a9d9693f65e2039f04d97446f27b65 SHA1 8490bb58270daedb7ab843525247372958ac54a1 SHA256 9598af3b4d1cb00bd5467ce4559ed528321399e2fb5bc63046e78c7cab805604
 EBUILD smolt-1.4.2.ebuild 2172 RMD160 2acd8a2d6a77dd9e74b4966209e20cac8b5ed282 SHA1 d15fc52448d36befd655653c5cc5726eb2a3bc94 SHA256 02a37969e2bcf6b93f80651a3b3febd22b8e16d393c1a52db47ad5c2a0232225
+EBUILD smolt-1.4.3.ebuild 2576 RMD160 e3ae061495429f103ab03052568c757fe438e5d9 SHA1 e58857d46f0f96595b9b668a44c165387639cd8c SHA256 31e92567ed177ee51a8ebb3a633ebd4f941bcabb1920e14f6183a58800795050
 EBUILD smolt-1.4.ebuild 2170 RMD160 79bf0e35eec0ff5306f678eb83aa4eeb5b1bd8e7 SHA1 9b800a8e85220a3178426854aac96300a0190a03 SHA256 1f5d17afbf354205a7be7e61065750ee94f22bd19fa9eb9051cd885b8609f2e1
-MISC ChangeLog 1442 RMD160 3a863e1ec29585da8811b9af7b4d8c3b02b6b4c5 SHA1 b8a10db1d028747776f2ef78c7e08fff4bf0a339 SHA256 22a45c1f5863c7e0f4d589e9c609bd5ccecfa98a7ffcf4d48bede981415d60a8
+MISC ChangeLog 1958 RMD160 ecdcf8bf7afd53d6b4a42e2bdd5d8205ebdf9f46 SHA1 b6798b6b0a0824b42bd1100d2fa4411fc9e47b59 SHA256 0b33d726b05810b4223d54ad2cf732379c273b14493e06deb373fb392458ad1f
 MISC metadata.xml 437 RMD160 e507dcaf0b67bd790ea5f36c48d378006ebeda22 SHA1 0c511b041c5de1589e23db5a737d2d1ffb77a146 SHA256 172c7979032f6bd6d304a46c3e6af7678b5069f4ca4845c0fb11d1b1c2974173
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2apK4ACgkQOeoy/oIi7uyRkgCgxQ8FklXU3V0O9GFEKtAeGnlc
-CEEAn1gZHXFedmq9dyZ6T8hBGA0ZrHuz
-=LIim
------END PGP SIGNATURE-----
diff --git a/app-admin/smolt/files/smolt-1.4.3-disable-distro-data.patch b/app-admin/smolt/files/smolt-1.4.3-disable-distro-data.patch
new file mode 100644
index 000000000000..04d9cfbfd261
--- /dev/null
+++ b/app-admin/smolt/files/smolt-1.4.3-disable-distro-data.patch
@@ -0,0 +1,11 @@
+--- client/distros/gentoo/main.py	2011-04-10 20:15:47.957683728 +0200
++++ client/distros/gentoo/main.py	2011-04-10 20:16:52.504183850 +0200
+@@ -61,7 +61,7 @@
+         """
+         Returns True if we run on top of Gentoo, else False.
+         """
+-        return os.path.exists('/etc/gentoo-release')
++        return False  # sping: Too early to enable
+ 
+     def gather(self, debug=False):
+         def _stage(text):
diff --git a/app-admin/smolt/files/smolt-1.4.3-hwdata-dir.patch b/app-admin/smolt/files/smolt-1.4.3-hwdata-dir.patch
new file mode 100644
index 000000000000..1820f8207a73
--- /dev/null
+++ b/app-admin/smolt/files/smolt-1.4.3-hwdata-dir.patch
@@ -0,0 +1,22 @@
+--- a/client/config.py
++++ b/client/config.py
+@@ -14,6 +14,7 @@ PUB_UUID = "/etc/smolt/pub-uuid"
+ PUB_UUID = "/etc/smolt/pub-uuid"
+ #UUID_DB = "/etc/smolt/uuiddb.cfg"
+ #ADMIN_TOKEN = "/etc/sysconfig/smolt-token"
++#HWDATA_DIR = "/usr/share/hwdata"
+ 
+ 
+ #These are the defaults taken from the source code.
+--- a/client/hwdata.py
++++ b/client/hwdata.py
+@@ -20,7 +20,8 @@ class DeviceMap:
+         self.vendors['usb'] = self.device_map('usb')
+ 
+     def device_map(self, bus='pci'):
+-        fn = "/usr/share/hwdata/%s.ids" % bus
++        from smolt import get_config_attr
++        fn = "%s/%s.ids" % (get_config_attr("HWDATA_DIR", "/usr/share/hwdata"), bus)
+         fo = open(fn, 'r')
+         vendors = {}
+         curvendor = None
diff --git a/app-admin/smolt/files/smolt-1.4.3-makefile-py-files.patch b/app-admin/smolt/files/smolt-1.4.3-makefile-py-files.patch
new file mode 100644
index 000000000000..33f5f8a57b8a
--- /dev/null
+++ b/app-admin/smolt/files/smolt-1.4.3-makefile-py-files.patch
@@ -0,0 +1,26 @@
+From dd41ac17a04d4689583aa5ec8b3bb467b43a24ce Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Tue, 29 Mar 2011 00:11:34 -0400
+Subject: [PATCH] Add devicelist.py and hwdata.py to client Makefile
+
+Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
+---
+ client/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/client/Makefile b/client/Makefile
+index 2164bf7..8bd5f1c 100644
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -1,7 +1,7 @@
+ PO_FILES=$(wildcard po/*.po)
+ MO_FILES=$(patsubst %.po,%.mo,$(PO_FILES))
+ # echo PY_FILES=$(ls -1 *.py | grep -v '^\(create_monthly\|getLink\|haldump\|hammer_add\|makeuuid\|starhscale\).py$' | sort)
+-PY_FILES=config.py deleteProfile.py fs_util.py gate.py gui.py i18n.py __init__.py MultipartPostHandler.py os_detect.py privacypolicy.py scan.py sendProfile.py smolt_config.py smoltFirstBoot.py smoltGui.py smolt_mythtv.py smolt.py software.py uuiddb.py
++PY_FILES=config.py deleteProfile.py devicelist.py fs_util.py gate.py gui.py hwdata.py i18n.py __init__.py MultipartPostHandler.py os_detect.py privacypolicy.py scan.py sendProfile.py smolt_config.py smoltFirstBoot.py smoltGui.py smolt_mythtv.py smolt.py software.py uuiddb.py
+ DIRED_MO_FILES=$(patsubst po/%.mo,mo/%/LC_MESSAGES/$(NAME).mo,$(MO_FILES))
+ 
+ 
+-- 
+1.7.4.1
+
diff --git a/app-admin/smolt/smolt-1.4.3.ebuild b/app-admin/smolt/smolt-1.4.3.ebuild
new file mode 100644
index 000000000000..8f282c5a2ba2
--- /dev/null
+++ b/app-admin/smolt/smolt-1.4.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/smolt/smolt-1.4.3.ebuild,v 1.1 2011/04/10 18:35:08 sping Exp $
+
+EAPI="2"
+PYTHON_DEPEND="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"
+
+COMMON_DEPS="sys-devel/gettext"
+
+DEPEND="${COMMON_DEPS}
+	sys-apps/sed"
+
+RDEPEND="${COMMON_DEPS}
+	>=dev-python/rhpl-0.213
+	>=dev-python/urlgrabber-3.0.0
+	>=dev-python/simplejson-1.7.1
+	sys-apps/pciutils
+	sys-apps/usbutils
+	sys-fs/udev
+	qt4? ( dev-python/PyQt4 )"
+
+S="${S}/client"
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	epatch "${FILESDIR}/${P}-makefile-py-files.patch" \
+		"${FILESDIR}/${P}-hwdata-dir.patch" \
+		"${FILESDIR}/${P}-disable-distro-data.patch"
+
+	# Make it use {usb,pci}.ids of pciutils/usbutils
+	sed -e "s:^#HWDATA_DIR = .*:HWDATA_DIR = \"${ROOT}/usr/share/misc\":" -i config.py || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" \
+		|| die "Install failed"
+	insinto "/usr/share/smolt/client"
+	doins -r distros
+
+	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 /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
+	fi
+	chmod 0444 "${ROOT}"/etc/smolt/hw-uuid
+	UUID=$(cat "${ROOT}"/etc/smolt/hw-uuid)
+	echo
+	elog "Your UUID is: ${UUID}"
+	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 "<dev-lang/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}
+}