aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-01-28 03:50:01 +0100
committerMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-01-28 03:50:01 +0100
commitde506d5929275fe26b4e10765f2ff2dccea26f9e (patch)
tree802ab6a513d3a455efd58c2008e1beb945763447 /app-admin
parentAdded gnome-keyring-python as optional dep for system-config-printer (diff)
downloadkde-de506d5929275fe26b4e10765f2ff2dccea26f9e.tar.gz
kde-de506d5929275fe26b4e10765f2ff2dccea26f9e.tar.bz2
kde-de506d5929275fe26b4e10765f2ff2dccea26f9e.zip
Disable nls when no LINGUAS specified in system-config-printer
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/system-config-printer/ChangeLog4
-rw-r--r--app-admin/system-config-printer/Manifest4
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.1.2.ebuild15
3 files changed, 18 insertions, 5 deletions
diff --git a/app-admin/system-config-printer/ChangeLog b/app-admin/system-config-printer/ChangeLog
index 32a130b7b2..1fe0f9b98d 100644
--- a/app-admin/system-config-printer/ChangeLog
+++ b/app-admin/system-config-printer/ChangeLog
@@ -4,6 +4,10 @@
28 Jan 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
system-config-printer-1.1.2.ebuild:
+ Disable nls when no LINGUAS specified
+
+ 28 Jan 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ system-config-printer-1.1.2.ebuild:
Added better nls handling (warning message when nls requested but LINGUAS
not set).
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 94e9c8c42f..8eab79f634 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,4 +1,4 @@
DIST system-config-printer-1.1.2.tar.bz2 863408 RMD160 bcd074f176cc10075ba07643dbd122404cbeff74 SHA1 58ba76bf6eb0be3deed6cb50a686386ee9d7bdfd SHA256 899871cf9244df289dac8c15befbb0a86dfa77fe20ef06349d2eb0de446b215a
-EBUILD system-config-printer-1.1.2.ebuild 1435 RMD160 3af08c5adcf973729a25b5e04357045e37fcf203 SHA1 e5b3fb8cbdf2a5da0c31cf59ca5d307b53085c4c SHA256 0dbc189215e4f1d025cb1a0247a2e5d1e628398fd65bca29d02ffc9ac2b04f14
-MISC ChangeLog 1243 RMD160 0286f6c7e95b9ef71e6af32b33bdbc1020a40086 SHA1 545d9ec824549af20a5fbf23810454351e583de0 SHA256 91c4b07cdf3ba08a29ca6df716e5b8578e4e84180704a47b54a384b1ee9c4798
+EBUILD system-config-printer-1.1.2.ebuild 1669 RMD160 cc8da411b7b76af4430465981a5ce24ee366b0fa SHA1 6cf628f06fe34fc947cad43c5c8f4c16fc55ffd4 SHA256 2752b0144d594c4ee62c655bb7de4a075e30d1c816d7bc0216570eb5bd77ff29
+MISC ChangeLog 1386 RMD160 3a8422268c98702ed6fcb8cd822f4fc78a5726e5 SHA1 4a1b88bbc68d6dc89391eef39f3f129deacc2da1 SHA256 8fb09b6797bdfe2552ddd5ea1aec549c2697d9058be4ecdee0221bd84f8df634
MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
diff --git a/app-admin/system-config-printer/system-config-printer-1.1.2.ebuild b/app-admin/system-config-printer/system-config-printer-1.1.2.ebuild
index a1da699b91..b3c2bbd2ee 100644
--- a/app-admin/system-config-printer/system-config-printer-1.1.2.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.1.2.ebuild
@@ -42,15 +42,24 @@ for X in ${APP_LINGUAS}; do
done
pkg_setup() {
- if use nls && [[ -z "${LINGUAS}" ]]; then
+ if (use nls && [ -z "${LINGUAS}" ]) || (! use nls && [ -n "${LINGUAS}" ]); then
echo
- ewarn "To get localized build, set LINGUAS variable appropriately."
+ ewarn "To get localized build, enable nls support and set LINGUAS variable appropriately."
echo
fi
}
src_configure() {
- econf $(use_enable nls) || die "econf failed"
+ local myconf
+
+ # enable nls only when any LINGUAS set
+ if use nls && [ -z "${LINGUAS}" ]; then
+ myconf="${myconf} --disable-nls"
+ else
+ myconf="${myconf} $(use_enable nls)"
+ fi
+
+ econf ${myconf} || die "econf failed"
}
src_install() {