summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-05-11 08:49:11 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-05-11 08:49:11 +0000
commitbe7649a2084f35530caaec620a3d44e44ef0308e (patch)
tree122a7c0e9e20f78d0e427ef37475ba4c07def159 /net-print
parentInitial commit. (diff)
downloadgentoo-2-be7649a2084f35530caaec620a3d44e44ef0308e.tar.gz
gentoo-2-be7649a2084f35530caaec620a3d44e44ef0308e.tar.bz2
gentoo-2-be7649a2084f35530caaec620a3d44e44ef0308e.zip
Re-add translation data that got lost from 1.5.0 to 1.5.2, bug 415455
(Portage version: 2.2.0_alpha103/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog8
-rw-r--r--net-print/cups/cups-1.5.2-r21.ebuild (renamed from net-print/cups/cups-1.5.2-r20.ebuild)8
2 files changed, 12 insertions, 4 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 441dca8d3fd9..46f531e228ce 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-print/cups
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.475 2012/05/08 23:00:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.476 2012/05/11 08:49:11 dilfridge Exp $
+
+*cups-1.5.2-r21 (11 May 2012)
+
+ 11 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ -cups-1.5.2-r20.ebuild, +cups-1.5.2-r21.ebuild:
+ Re-add translation data that got lost from 1.5.0 to 1.5.2, bug 415455
08 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+files/cups-1.6.0-dont-compress-manpages.patch,
diff --git a/net-print/cups/cups-1.5.2-r20.ebuild b/net-print/cups/cups-1.5.2-r21.ebuild
index f7fd1d5f3acf..4349a35cae53 100644
--- a/net-print/cups/cups-1.5.2-r20.ebuild
+++ b/net-print/cups/cups-1.5.2-r21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.5 2012/05/08 22:24:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.1 2012/05/11 08:49:11 dilfridge Exp $
EAPI=4
@@ -14,6 +14,7 @@ if [[ "${PV}" != "9999" ]]; then
SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
+ http://dev.gentoo.org/~dilfridge/distfiles/${P}-locales.patch.xz
"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
else
@@ -94,9 +95,10 @@ PATCHES=(
"${FILESDIR}/${PN}-1.5.2-threads.patch"
"${FILESDIR}/${PN}-1.5.2-threads2.patch"
"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch" # systemd support
- "${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2" # revert ipp backend to 1.4 state
- "${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2" # avahi support from debian
+ "${WORKDIR}/${PN}-1.5.2-ipp-r8950.patch" # revert ipp backend to 1.4 state
+ "${WORKDIR}/${PN}-1.5.2-avahi.patch" # avahi support from debian
"${FILESDIR}/${PN}-1.5.2-browsing.patch" # browsing off by default
+ "${WORKDIR}/${PN}-1.5.2-locales.patch" # patch locales back into existence
)
pkg_setup() {