* [gentoo-commits] dev/ikelos:master commit in: mail-client/mailnag/files/, mail-client/mailnag/
@ 2013-04-21 23:37 Mike Auty
0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2013-04-21 23:37 UTC (permalink / raw
To: gentoo-commits
commit: f6b902850ceebd3b3bf4f09f3bf9c2bd6cc6f5f8
Author: Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Sun Apr 21 23:35:44 2013 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 23:35:44 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=f6b90285
Fix up maildir's data directories so that they're in the right place.
---
mail-client/mailnag/Manifest | 4 ++-
.../mailnag/files/mailnag-9999-datadir.patch | 13 ++++++++
.../files/mailnag-9999-libdir-location.patch | 32 ++++++++++++++++++++
mail-client/mailnag/mailnag-9999.ebuild | 5 ++-
4 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/mail-client/mailnag/Manifest b/mail-client/mailnag/Manifest
index 798e327..a8d4f6a 100644
--- a/mail-client/mailnag/Manifest
+++ b/mail-client/mailnag/Manifest
@@ -1 +1,3 @@
-EBUILD mailnag-9999.ebuild 873 SHA256 38811906cc2111626ade30d6f6ec5946ae7b22fa18c760001d1777061db93864 SHA512 e3d3c11304c82c9aa5f276161ab4a68b2c9e2eaacde6ba1b2069341cec8a9b197ab519fa3f8c3eed7b6febdd7c080a5010cf87f1610bef9f5bc1dbe0b27d080e WHIRLPOOL 676872274eb5c3fed8abfd616b1c8a79a83290fb86ee98cd3391a287fff0ccec249ae94cfdcd2131c83b5563807289918bf1715a175f3066d388f5874286731a
+AUX mailnag-9999-datadir.patch 523 SHA256 31d546bdcaadae036efe825ae012f3a82eba0ab1479858804f76fdf983befb23 SHA512 dc9c6b9e5e57ca5abfabc9a1b3355abaa89300aeff0cbdc24030aa9760f50b4b84b5f20e63f32e0c51ab156050971af57c57832b51a6ab96cacb1272f96a32ed WHIRLPOOL 3a73c35802ba14166f9ccc29d8ceeb940f7b381fa166daf58fc0af35e10e2e20dd0dcf9f847d81798b93f59aa18e96b9d27f1b399b77386457a060ad56a29ed9
+AUX mailnag-9999-libdir-location.patch 741 SHA256 6cf64ba66580991eda5df1480771e0b35bd79442a94a7c893c85ae5c1707ad83 SHA512 d5335fca1aab1807f5dca007091713e14ce08999cff507c6b8298b97305dfd3dd89ab097145c6277b1a2353244422e15759a85366705484914c7b3fedd5cb35a WHIRLPOOL fe15a005d4b5d47a1b27033e1493be69fcb9f6bc8a0e542d9d03e2d42139472a145804ecb82fa1dedb693f2009ae085116ec7493a337d9f0ca88637a5f63ab23
+EBUILD mailnag-9999.ebuild 864 SHA256 f2a957d9117643c1db2055c215ded557d7f6de510f4de21c673474999a03f5ce SHA512 bc24f900b6904c6f1b6161c6f4306d81d47727b850fa4ed31730dc5a0a404f6b87a935e75d864f20c00e22e6102a146b5e07297324dd79d19875f3cc38ca3a4a WHIRLPOOL d99e7a67043efe27cca4dd37171927408a2724803a417d8bef00fad2fa0ead54a6026ccfb5efda9e1b81fd2689d75edbe88accc1945db66db90d7183aa6e6fbf
diff --git a/mail-client/mailnag/files/mailnag-9999-datadir.patch b/mail-client/mailnag/files/mailnag-9999-datadir.patch
new file mode 100644
index 0000000..5c9802a
--- /dev/null
+++ b/mail-client/mailnag/files/mailnag-9999-datadir.patch
@@ -0,0 +1,13 @@
+diff --git a/Mailnag/common/utils.py b/Mailnag/common/utils.py
+index 1717679..05d0e2f 100644
+--- a/Mailnag/common/utils.py
++++ b/Mailnag/common/utils.py
+@@ -39,7 +39,7 @@ def get_data_file(filename):
+ # Add "./data" in workdir for running from builddir
+ data_paths = []
+ data_paths.append("./data")
+- data_paths.extend(base.load_data_paths(PACKAGE_NAME))
++ data_paths.extend([os.path.join(x, 'data') for x in base.load_data_paths(PACKAGE_NAME)])
+
+ for direc in data_paths:
+ file_path = os.path.join(direc, filename)
diff --git a/mail-client/mailnag/files/mailnag-9999-libdir-location.patch b/mail-client/mailnag/files/mailnag-9999-libdir-location.patch
new file mode 100644
index 0000000..e39a625
--- /dev/null
+++ b/mail-client/mailnag/files/mailnag-9999-libdir-location.patch
@@ -0,0 +1,32 @@
+diff --git a/mailnag b/mailnag
+index 934474e..cfa37e8 100755
+--- a/mailnag
++++ b/mailnag
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-LIB_DIR=./Mailnag
++LIB_DIR=/usr/share/mailnag/Mailnag
+
+ config_dir="${XDG_CONFIG_HOME:-$HOME/.config}/mailnag"
+
+@@ -18,5 +18,5 @@ fi
+
+ rm --force "$config_dir/mailnag.log"
+
+-python $LIB_DIR/mailnag.py >> "$config_dir/mailnag.log" 2>&1 &
++python2.7 $LIB_DIR/mailnag.py >> "$config_dir/mailnag.log" 2>&1 &
+
+diff --git a/mailnag_config b/mailnag_config
+index 0fd379e..6522140 100755
+--- a/mailnag_config
++++ b/mailnag_config
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+-LIB_DIR=./Mailnag
++LIB_DIR=/usr/share/mailnag/Mailnag
+
+-python $LIB_DIR/config.py
++python2.7 $LIB_DIR/config.py
+
+ if [ $? -eq 0 ]; then
+ # Restart mailnag daemon
diff --git a/mail-client/mailnag/mailnag-9999.ebuild b/mail-client/mailnag/mailnag-9999.ebuild
index 3ea89bb..268d555 100644
--- a/mail-client/mailnag/mailnag-9999.ebuild
+++ b/mail-client/mailnag/mailnag-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit git-2 python-single-r1
+inherit git-2 eutils python-single-r1
DESCRIPTION="Mail nagger for gnome-shell (port of popper for unity)"
HOMEPAGE="http://launchpad.net/mailnag"
@@ -28,7 +28,8 @@ src_prepare() {
cd "${S}"
"${S}/gen_locales"
- sed -i -e 's|LIB_DIR=./Mailnag|LIB_DIR=/usr/share/mailnag/Mailnag|' -e 's|^python |python2.7 |' "${PN}"*
+ epatch "${FILESDIR}/${P}-libdir-location.patch"
+ epatch "${FILESDIR}/${P}-datadir.patch"
}
src_install() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: mail-client/mailnag/files/, mail-client/mailnag/
@ 2013-04-21 23:50 Mike Auty
0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2013-04-21 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 33b607cdda2db34bd2c60b20d787e49d9b80e5b6
Author: Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 23:50:15 2013 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 23:50:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=33b607cd
Rework mailnag to correctly use distutils-r1 eclass.
---
mail-client/mailnag/Manifest | 4 +--
.../mailnag/files/mailnag-9999-datadir.patch | 13 --------
.../files/mailnag-9999-libdir-location.patch | 32 --------------------
mail-client/mailnag/mailnag-9999.ebuild | 15 +--------
4 files changed, 3 insertions(+), 61 deletions(-)
diff --git a/mail-client/mailnag/Manifest b/mail-client/mailnag/Manifest
index a8d4f6a..b9f3122 100644
--- a/mail-client/mailnag/Manifest
+++ b/mail-client/mailnag/Manifest
@@ -1,3 +1 @@
-AUX mailnag-9999-datadir.patch 523 SHA256 31d546bdcaadae036efe825ae012f3a82eba0ab1479858804f76fdf983befb23 SHA512 dc9c6b9e5e57ca5abfabc9a1b3355abaa89300aeff0cbdc24030aa9760f50b4b84b5f20e63f32e0c51ab156050971af57c57832b51a6ab96cacb1272f96a32ed WHIRLPOOL 3a73c35802ba14166f9ccc29d8ceeb940f7b381fa166daf58fc0af35e10e2e20dd0dcf9f847d81798b93f59aa18e96b9d27f1b399b77386457a060ad56a29ed9
-AUX mailnag-9999-libdir-location.patch 741 SHA256 6cf64ba66580991eda5df1480771e0b35bd79442a94a7c893c85ae5c1707ad83 SHA512 d5335fca1aab1807f5dca007091713e14ce08999cff507c6b8298b97305dfd3dd89ab097145c6277b1a2353244422e15759a85366705484914c7b3fedd5cb35a WHIRLPOOL fe15a005d4b5d47a1b27033e1493be69fcb9f6bc8a0e542d9d03e2d42139472a145804ecb82fa1dedb693f2009ae085116ec7493a337d9f0ca88637a5f63ab23
-EBUILD mailnag-9999.ebuild 864 SHA256 f2a957d9117643c1db2055c215ded557d7f6de510f4de21c673474999a03f5ce SHA512 bc24f900b6904c6f1b6161c6f4306d81d47727b850fa4ed31730dc5a0a404f6b87a935e75d864f20c00e22e6102a146b5e07297324dd79d19875f3cc38ca3a4a WHIRLPOOL d99e7a67043efe27cca4dd37171927408a2724803a417d8bef00fad2fa0ead54a6026ccfb5efda9e1b81fd2689d75edbe88accc1945db66db90d7183aa6e6fbf
+EBUILD mailnag-9999.ebuild 595 SHA256 a2a95f7e7f13b6a7f1aa0a355d65bc0d40740319b6e0ba070269b7900ccaf432 SHA512 7eab5f2d9755e20c746e8cfe5178df9b1e22312087d43bf949f290fd64621099fabeb1d078013dde25abc56f8c6a7f91215ecc84f34ac0ed1a15ac935d86e1eb WHIRLPOOL 59e77574a9097a2558378612bbcf729e29f05c3ecc4617a7ff8fafbc4e63537e18e8ac90c9edb2a812168082bc93cc393b004e37ab993e82bf691f1f3349509a
diff --git a/mail-client/mailnag/files/mailnag-9999-datadir.patch b/mail-client/mailnag/files/mailnag-9999-datadir.patch
deleted file mode 100644
index 5c9802a..0000000
--- a/mail-client/mailnag/files/mailnag-9999-datadir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Mailnag/common/utils.py b/Mailnag/common/utils.py
-index 1717679..05d0e2f 100644
---- a/Mailnag/common/utils.py
-+++ b/Mailnag/common/utils.py
-@@ -39,7 +39,7 @@ def get_data_file(filename):
- # Add "./data" in workdir for running from builddir
- data_paths = []
- data_paths.append("./data")
-- data_paths.extend(base.load_data_paths(PACKAGE_NAME))
-+ data_paths.extend([os.path.join(x, 'data') for x in base.load_data_paths(PACKAGE_NAME)])
-
- for direc in data_paths:
- file_path = os.path.join(direc, filename)
diff --git a/mail-client/mailnag/files/mailnag-9999-libdir-location.patch b/mail-client/mailnag/files/mailnag-9999-libdir-location.patch
deleted file mode 100644
index e39a625..0000000
--- a/mail-client/mailnag/files/mailnag-9999-libdir-location.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/mailnag b/mailnag
-index 934474e..cfa37e8 100755
---- a/mailnag
-+++ b/mailnag
-@@ -1,5 +1,5 @@
- #!/bin/bash
--LIB_DIR=./Mailnag
-+LIB_DIR=/usr/share/mailnag/Mailnag
-
- config_dir="${XDG_CONFIG_HOME:-$HOME/.config}/mailnag"
-
-@@ -18,5 +18,5 @@ fi
-
- rm --force "$config_dir/mailnag.log"
-
--python $LIB_DIR/mailnag.py >> "$config_dir/mailnag.log" 2>&1 &
-+python2.7 $LIB_DIR/mailnag.py >> "$config_dir/mailnag.log" 2>&1 &
-
-diff --git a/mailnag_config b/mailnag_config
-index 0fd379e..6522140 100755
---- a/mailnag_config
-+++ b/mailnag_config
-@@ -1,7 +1,7 @@
- #!/bin/bash
--LIB_DIR=./Mailnag
-+LIB_DIR=/usr/share/mailnag/Mailnag
-
--python $LIB_DIR/config.py
-+python2.7 $LIB_DIR/config.py
-
- if [ $? -eq 0 ]; then
- # Restart mailnag daemon
diff --git a/mail-client/mailnag/mailnag-9999.ebuild b/mail-client/mailnag/mailnag-9999.ebuild
index 268d555..f17af93 100644
--- a/mail-client/mailnag/mailnag-9999.ebuild
+++ b/mail-client/mailnag/mailnag-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit git-2 eutils python-single-r1
+inherit git-2 eutils distutils-r1
DESCRIPTION="Mail nagger for gnome-shell (port of popper for unity)"
HOMEPAGE="http://launchpad.net/mailnag"
@@ -25,17 +25,6 @@ DEPEND="dev-python/pygobject:3
RDEPEND="${DEPEND}"
src_prepare() {
- cd "${S}"
- "${S}/gen_locales"
-
- epatch "${FILESDIR}/${P}-libdir-location.patch"
- epatch "${FILESDIR}/${P}-datadir.patch"
+ sed -i -e 's|./mailnag|mailnag|' ${S}/mailnag_config
}
-src_install() {
- dodir "/usr/share/${PN}"
- cp -r "${S}"/* "${D}/usr/share/${PN}/"
-
- dosym "/usr/share/${PN}/${PN}" "/usr/bin/${PN}"
- dosym "/usr/share/${PN}/${PN}_config" "/usr/bin/${PN}_config"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-21 23:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-21 23:50 [gentoo-commits] dev/ikelos:master commit in: mail-client/mailnag/files/, mail-client/mailnag/ Mike Auty
-- strict thread matches above, loose matches on Subject: below --
2013-04-21 23:37 Mike Auty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox