summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasufell <julian.ospald@googlemail.com>2012-02-10 06:58:13 +0000
committerhasufell <julian.ospald@googlemail.com>2012-02-10 06:58:13 +0000
commitb5fb70ec87163908062b567ec9b123d9bb11b49a (patch)
tree7c7831ca32fd75839f11cffd683291695fb8c124 /app-admin
parentgnome-extra/nautilus-gloobus-preview: Python 2.4 is being dropped from the tree. (diff)
downloadsunrise-reviewed-b5fb70ec87163908062b567ec9b123d9bb11b49a.tar.gz
sunrise-reviewed-b5fb70ec87163908062b567ec9b123d9bb11b49a.tar.bz2
sunrise-reviewed-b5fb70ec87163908062b567ec9b123d9bb11b49a.zip
app-admin/conkyguayadeque: fixed incorrect time format for >=guayadeque-0.3.5
svn path=/sunrise/; revision=12742
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/conkyguayadeque/ChangeLog4
-rw-r--r--app-admin/conkyguayadeque/Manifest5
-rw-r--r--app-admin/conkyguayadeque/conkyguayadeque-9999.ebuild6
-rw-r--r--app-admin/conkyguayadeque/files/time.patch10
4 files changed, 21 insertions, 4 deletions
diff --git a/app-admin/conkyguayadeque/ChangeLog b/app-admin/conkyguayadeque/ChangeLog
index 6ad0048d9..65026acaf 100644
--- a/app-admin/conkyguayadeque/ChangeLog
+++ b/app-admin/conkyguayadeque/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Feb 2012; hasufell <julian.ospald@googlemail.com>
+ conkyguayadeque-9999.ebuild, +files/time.patch:
+ fixed incorrect time format for >=guayadeque-0.3.5
+
18 Jan 2012; hasufell <julian.ospald@googlemail.com>
-conkyguayadeque-9999.ebuild:
removed keywords
diff --git a/app-admin/conkyguayadeque/Manifest b/app-admin/conkyguayadeque/Manifest
index 5d0e325fe..1136fe41b 100644
--- a/app-admin/conkyguayadeque/Manifest
+++ b/app-admin/conkyguayadeque/Manifest
@@ -1,3 +1,4 @@
-EBUILD conkyguayadeque-9999.ebuild 527 RMD160 221d3951b5dd78d6bba4c63b87d0f506977cd711 SHA1 73a827a6fdb2a8367908d3116b418be4ccf93797 SHA256 3a48798b5cbb5334158ce9a836d725ae9019551d9bc94c9075a4c85706e1a2a7
-MISC ChangeLog 401 RMD160 916781cfe16a342011d88c999f928480875bbe25 SHA1 cc6ae0148f31cc4c08de7e02bb4ec5bddf9b1891 SHA256 d4dccd8348ad4607af88df95e36ee6928baaf531af242d5416b708ce2ac01434
+AUX time.patch 571 RMD160 b0632f69c8c9550afe48db4fe7fa234d4c136cd8 SHA1 2dce733d885db173afdad98330878dcfec288dad SHA256 575d621936b0fdf5b200b5766f2951c0c186b4a9e181ec32c576b82a387a8d05
+EBUILD conkyguayadeque-9999.ebuild 612 RMD160 fb8b078b663d30b9492e376c30b36a4ad5d9300f SHA1 04c3e33cfd411c2f07315b77fc4ae8072b3077c5 SHA256 f225c3f9baafedd2310477a73d809784015d706c291cd73ca890d02a7d172b44
+MISC ChangeLog 560 RMD160 12bad0dc61282961776f72da04dc05667d75bb5a SHA1 1ccd4977e6a4ae4d0623a4394cc7fc0f20aeab4f SHA256 6dbf251b711b816e4e698ce60998c4438c0fba1e54faa70615034759ca91547b
MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/app-admin/conkyguayadeque/conkyguayadeque-9999.ebuild b/app-admin/conkyguayadeque/conkyguayadeque-9999.ebuild
index 637a9ca5d..099db4314 100644
--- a/app-admin/conkyguayadeque/conkyguayadeque-9999.ebuild
+++ b/app-admin/conkyguayadeque/conkyguayadeque-9999.ebuild
@@ -5,7 +5,7 @@
EAPI=4
PYTHON_DEPEND="2"
-inherit bzr distutils
+inherit bzr distutils eutils
DESCRIPTION="conky plugin for guayadeque"
HOMEPAGE="http://bazaar.launchpad.net/~conky-companions/+junk/conkyguayadeque"
@@ -19,9 +19,11 @@ KEYWORDS=""
IUSE=""
RDEPEND="app-admin/conky
- media-sound/guayadeque"
+ >=media-sound/guayadeque-0.3.5"
src_prepare() {
default
+ # incorrect time format since 0.3.5
+ epatch "${FILESDIR}"/time.patch
python_convert_shebangs -r 2 .
}
diff --git a/app-admin/conkyguayadeque/files/time.patch b/app-admin/conkyguayadeque/files/time.patch
new file mode 100644
index 000000000..fe1cce73a
--- /dev/null
+++ b/app-admin/conkyguayadeque/files/time.patch
@@ -0,0 +1,10 @@
+--- conkyGuayadeque.py.old 2012-01-22 02:09:49.000000000 +0100
++++ conkyGuayadeque.py 2012-01-22 02:59:08.000000000 +0100
+@@ -209,6 +209,7 @@
+ length_seconds = 0
+
+ current_seconds = int(iface_player.PositionGet() / 1000)
++ length_seconds = int(length_seconds / 1000)
+
+ if length_seconds > 0:
+ current_position_percent = str(int((float(current_seconds) / float(length_seconds))*100))