diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-16 05:47:58 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-16 05:47:58 +0000 |
commit | 2b2c5a79ca55657c21099343ecd2af4deaa3a914 (patch) | |
tree | dfa73854fee3c0bf2d3d932095ac3fd5243fec27 /app-admin/smolt | |
parent | Force at least openssl 0.9.8 in order to remove ugly has_version and epatch c... (diff) | |
download | gentoo-2-2b2c5a79ca55657c21099343ecd2af4deaa3a914.tar.gz gentoo-2-2b2c5a79ca55657c21099343ecd2af4deaa3a914.tar.bz2 gentoo-2-2b2c5a79ca55657c21099343ecd2af4deaa3a914.zip |
old
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/smolt')
-rw-r--r-- | app-admin/smolt/files/smolt-1.2-Makefile-fix-install.patch | 38 | ||||
-rw-r--r-- | app-admin/smolt/files/smolt-1.2-config.py-gentoo-config.patch | 110 | ||||
-rw-r--r-- | app-admin/smolt/files/smolt-1.4-upstream-docdir.patch | 62 | ||||
-rw-r--r-- | app-admin/smolt/files/smolt-1.4-upstream-fix-gzip-calls.patch | 29 | ||||
-rw-r--r-- | app-admin/smolt/smolt-1.2.ebuild | 83 | ||||
-rw-r--r-- | app-admin/smolt/smolt-1.4.2.ebuild | 79 | ||||
-rw-r--r-- | app-admin/smolt/smolt-1.4.ebuild | 79 |
7 files changed, 0 insertions, 480 deletions
diff --git a/app-admin/smolt/files/smolt-1.2-Makefile-fix-install.patch b/app-admin/smolt/files/smolt-1.2-Makefile-fix-install.patch deleted file mode 100644 index 399731ed6e71..000000000000 --- a/app-admin/smolt/files/smolt-1.2-Makefile-fix-install.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur client.orig/Makefile client/Makefile ---- client.orig/Makefile 2008-11-30 20:31:57.000000000 +0100 -+++ client/Makefile 2009-02-04 22:39:14.000000000 +0100 -@@ -42,7 +42,6 @@ - install -d -m 0755 icons/ $(DATADIR)/$(NAME)/client/icons/ - cp -adv $(CLIENT_FILES) $(DATADIR)/$(NAME)/client/ - -- - mkdir -p $(DATADIR)/icons/hicolor/16x16/apps/ - mkdir -p $(DATADIR)/icons/hicolor/22x22/apps/ - mkdir -p $(DATADIR)/icons/hicolor/24x24/apps/ -@@ -53,12 +52,12 @@ - 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 $(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 -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 - - ln -sf $(DATADIR)/$(NAME)/client/sendProfile.py $(BINDIR)/smoltSendProfile - ln -sf $(DATADIR)/$(NAME)/client/deleteProfile.py $(BINDIR)/smoltDeleteProfile -@@ -67,7 +66,7 @@ - chmod +x $(DATADIR)/$(NAME)/client/*Profile.py - chmod +x $(DATADIR)/$(NAME)/client/smoltGui.py - -- desktop-file-install --vendor='fedora' --dir=$(DATADIR)/applications ./smolt.desktop -+ #desktop-file-install --vendor='fedora' --dir=$(DATADIR)/applications ./smolt.desktop - - move-mo: $(DIRED_MO_FILES) - diff --git a/app-admin/smolt/files/smolt-1.2-config.py-gentoo-config.patch b/app-admin/smolt/files/smolt-1.2-config.py-gentoo-config.patch deleted file mode 100644 index e811ab281119..000000000000 --- a/app-admin/smolt/files/smolt-1.2-config.py-gentoo-config.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -Naur client.orig/config.py client/config.py ---- client.orig/config.py 2008-11-30 20:31:57.000000000 +0100 -+++ client/config.py 2009-02-05 22:16:56.000000000 +0100 -@@ -6,15 +6,9 @@ - SMOON_URL = "http://www.smolts.org/" - SECURE = 0 - -- - #Only a fool would edit what lays beyond here - #Are you that fool? - --HW_UUID = "/etc/sysconfig/hw-uuid" --PUB_UUID = "/etc/sysconfig/pub-uuid" --#ADMIN_TOKEN = "/etc/sysconfig/smolt-token" -- -- - #These are the defaults taken from the source code. - #fs_types = get_config_attr("FS_TYPES", ["ext2", "ext3", "xfs", "reiserfs"]) - #fs_mounts = get_config_attr("FS_MOUNTS", ["/", "/home", "/etc", "/var", "/boot"]) -@@ -23,86 +17,10 @@ - - FS_T_FILTER=False - FS_M_FILTER=True -+#TODO gentoo'ify the next line - FS_MOUNTS=commands.getoutput('rpm -ql filesystem').split('\n') - -- --#This will attempt to find the distro. --#Uncomment any of the OS lines below to hardcode. - OS = os_detect.get_os_info() -- --#For Redhat --#try: --# OS = file('/etc/redhat-release').read().strip() --#except IOError: --# OS = "Shadowman!" -- --##For SuSE --#try: --# OS = file('/etc/SuSE-release').read().split('\n')[0].strip() --#except IOError: --# OS = "It's a Lizard man!, It changes Colours!" --# --# --#For Debian --#try: -- #this is a bit of a kludge, as /etc/debian-release is -- #somewhat incomplete in what it gives you -- #I also figure this should work better in -- #ubuntu --# OS = file('/etc/issue.net').read().strip() --#except IOError: --# OS = "The swirl, it's Spinning!" -- -- --##For Frugalware --#try: --# OS = file('/etc/frugalware-release').read().strip() --#except IOError: --# OS = "Too cheap to have a version!" --# --##For Mythvantage --#try: --# OS = file('/etc/mythvantage-release').read().strip() --#except IOError: --# OS = "The OS doesn't really exist but in the minds of Holywood" --# --##For Slackware --#try: --# OS = file('/etc/slackware-version').read().strip() --#except IOError: --# OS = "Quit slacking you kids!" --# --##For Archlinux --#try: --# if os.path.exists('/etc/arch-release'): --# archfile = file('/etc/issue') --# archfile.readline() --# archrelease = archfile.readline() --# archrelease = archrelease.split('\\r') --# OS = archrelease[0] --# else: --# OS = "It's an impossibly tall Arch!" --#except IOError: --# OS = "It's an impossibly tall Arch!" --# --##For Crux --#try: --# if os.path.exists('/etc/issue'): --# cruxfile = open('/etc/issue') --# cruxrelease = cruxfile.read().strip() --# if cruxrelease.find("CRUX") >= 0: --# return "CRUX" --# else: --# return "Chuck Norris" --#except IOError: --# return "Chuck Norris" --#For Gentoo --#try: --# OS = file('/etc/gentoo-release').read().strip() --#except IOError: --# OS = "It's the fastest penguin!" -- -- --#For non RH Distros --#HW_UUID = "/etc/smolt/hw-uuid" -- -+HW_UUID = "/etc/smolt/hw-uuid" -+PUB_UUID = "/etc/smolt/pub-uuid" -+ADMIN_TOKEN = "/etc/smolt/smolt-token" diff --git a/app-admin/smolt/files/smolt-1.4-upstream-docdir.patch b/app-admin/smolt/files/smolt-1.4-upstream-docdir.patch deleted file mode 100644 index 2da0d87cf933..000000000000 --- a/app-admin/smolt/files/smolt-1.4-upstream-docdir.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index 494094c11de0..000000000000 --- a/app-admin/smolt/files/smolt-1.4-upstream-fix-gzip-calls.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/smolt-1.2.ebuild b/app-admin/smolt/smolt-1.2.ebuild deleted file mode 100644 index e64287c2d310..000000000000 --- a/app-admin/smolt/smolt-1.2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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.2.ebuild,v 1.5 2011/04/05 05:11:11 ulm Exp $ - -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" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk" - -DEPEND="dev-lang/python - sys-devel/gettext - gtk? ( >=dev-python/pygtk-2.10.3 )" - -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" - -S="${S}/client" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-config.py-gentoo-config.patch" - epatch "${FILESDIR}/${P}-Makefile-fix-install.patch" -} - -src_install() { - emake install DESTDIR="${D}" || die "Install failed" - - insinto /usr/share/smolt/client/ - doins os_detect.py - - dosym /etc/smolt/config.py /usr/share/smolt/client/config.py - domenu smolt.desktop - - if ! use gtk; then - rm "${D}"/usr/bin/smoltGui - rm "${D}"/usr/share/smolt/client/smoltGui.py - rm "${D}"/usr/share/smolt/client/gui.py - fi - - doman man/smolt{SendProfile,DeleteProfile}.1 - use gtk && doman man/smoltGui.1 - - dodoc ../README ../TODO ../doc/PrivacyPolicy - newinitd "${FILESDIR}"/${PN}-init.d ${PN} -} - -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 - 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 gtk && 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} -} diff --git a/app-admin/smolt/smolt-1.4.2.ebuild b/app-admin/smolt/smolt-1.4.2.ebuild deleted file mode 100644 index 92d5a0efb4e9..000000000000 --- a/app-admin/smolt/smolt-1.4.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# 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.2.ebuild,v 1.3 2011/04/05 05:11:11 ulm 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="dev-lang/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 /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 "<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} -} diff --git a/app-admin/smolt/smolt-1.4.ebuild b/app-admin/smolt/smolt-1.4.ebuild deleted file mode 100644 index 2683072c7ea8..000000000000 --- a/app-admin/smolt/smolt-1.4.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# 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.ebuild,v 1.3 2011/04/05 05:11:11 ulm 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="dev-lang/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 /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 "<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} -} |