Bring back nodrm USE flag, bug #296455

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-text/pdftk/ChangeLog b/app-text/pdftk/ChangeLog
index 0a1e43daa8da422e83c536b8bcc6bb65943b2106..57bc443e7586ff61a4d76a141cd72a9031d8406a 100644 (file)
--- a/app-text/pdftk/ChangeLog
+++ b/app-text/pdftk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/pdftk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.31 2009/11/14 16:30:01 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.32 2010/06/23 08:24:20 chithanh Exp $
+
+  23 Jun 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  pdftk-1.41-r1.ebuild, metadata.xml:
+  Bring back nodrm USE flag, bug #296455
 
   14 Nov 2009; Markus Meier <maekke@gentoo.org> pdftk-1.41-r1.ebuild:
   amd64/x86 stable, bug #275620

diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 540b893f7afc2bf89ccc04d7daae5025c0565ea0..7d1cbe062e28eb70783fb7b2131319f54db50d5c 100644 (file)
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -2,6 +2,6 @@ AUX pdftk-1.41-gcc-4.3.patch 7984 RMD160 524c2ac4bca6e9b35bbd8996dd106287170798a
 AUX pdftk-1.41-gcc-4.4.patch 937 RMD160 0ef846693ee1a53a70ff6ca2eede5443897121f7 SHA1 9051c1afcbf2df30c0a5edfa38accf4b2a7f88be SHA256 4703a490dea737a11aeb430985e5a8fc6eb2fcb22796f05cacba03d0f3d82f9a
 AUX pdftk-1.41-honor-ldflags.patch 660 RMD160 5e5c97f31571bbe5cab255f6048ba345224a3d7a SHA1 661ee53349007b03268fac94b2bb9cd0f5406c0b SHA256 79735bb877a361d213eb88c4d83b63c6815a5b87370b98c9548ed029785c9ba7
 DIST pdftk-1.41.tar.gz 1011368 RMD160 09394a3d772556fa2c053bcef843b1e593feab1d SHA1 256583800c213419a845b28fe9ad5baccceddf80 SHA256 6b0ff22297b50600083bb8f6b4c507c68144b2d70738d31e0e19ab4091df5164
-EBUILD pdftk-1.41-r1.ebuild 1098 RMD160 9c54d82b9a199d0dd1426b049aaed0545e72da62 SHA1 3a03b83c1c364ccd12038de06844da3f9eac14e7 SHA256 e5282aa4b75cc764035225827296d17ee62881cd099c2ce7aa3322e85fb37fe8
-MISC ChangeLog 4593 RMD160 fc4a499f516040ab3f42b51696368fe9796172aa SHA1 34fb1d08f1cc8e5029e6d612f202dcb5fa449616 SHA256 066857be4351a3ef291d04040e761c03894d54e3488107b1e930afdb607cfd94
-MISC metadata.xml 179 RMD160 1f8cdfb55f2bc86d61a3ccdca0dcd9df94db41da SHA1 f7751973dd78a5551eaaaaf638802bf0bf14f9ea SHA256 50eed75422d647880b04974ac25a9c3849a2ce20366d508e778d04d4724f9779
+EBUILD pdftk-1.41-r1.ebuild 1286 RMD160 736fb02d6b280362f837e603e5934f0c1ee9b22d SHA1 5cbda7c08fdcacd42e8b7c32d4616da9219a0368 SHA256 4c19cb92907140f025674de9ff681d329ecf4ce974d6a974d09c94ef7e466635
+MISC ChangeLog 4744 RMD160 2bd6e05568aa026ad625a57775b690a978cf70e4 SHA1 3863fbd77819b7e52dca90e4c17ede724ff7d051 SHA256 891405ad4c0860f27efa9b4690c81f8df9f3a21c692feb7e303eb753a97d51ca
+MISC metadata.xml 291 RMD160 5314a482db7f9fd2dc8b31125050f07ddf084e1f SHA1 f47471c90a356647a2439f2b5686e980fae0c853 SHA256 0fc05920cf4bc755946f9e137397e80f8c65bc50d111a1ab8bc849bfc7cb2747

diff --git a/app-text/pdftk/metadata.xml b/app-text/pdftk/metadata.xml
index a8a5788d684c67d296cf676689ad6c951f078a8a..8b44ae4e6d20ee05f2257ce0dcb804c764a71ce4 100644 (file)
--- a/app-text/pdftk/metadata.xml
+++ b/app-text/pdftk/metadata.xml
@@ -3,4 +3,8 @@
 <pkgmetadata>
 <herd>printing</herd>
 <herd>java</herd>
+<use>
+  <flag name='nodrm'>Decrypt a document with the user_pw even if it has an
+    owner_pw set</flag>
+</use>
 </pkgmetadata>

diff --git a/app-text/pdftk/pdftk-1.41-r1.ebuild b/app-text/pdftk/pdftk-1.41-r1.ebuild
index fce3ea6aa4e8d820f29779f994e85f851d791d0e..4c2c444a2f004bc31d7f891a6c50e2445964decf 100644 (file)
--- a/app-text/pdftk/pdftk-1.41-r1.ebuild
+++ b/app-text/pdftk/pdftk-1.41-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.41-r1.ebuild,v 1.5 2009/11/14 16:30:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.41-r1.ebuild,v 1.6 2010/06/23 08:24:20 chithanh Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.pdfhacks.com/pdftk/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
+IUSE="nodrm"
 DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
 
 S="${WORKDIR}/${P}/${PN}"
@@ -28,6 +28,10 @@ src_unpack() {
        epatch "${FILESDIR}/${P}-honor-ldflags.patch"
        # force usage of custom CFLAGS.
        sed -iorig 's:-O2:\$(CFLAGS):g' "${S}"/Makefile.Generic
+       # nodrm patch, bug 296455
+       if use nodrm; then
+               sed -i 's:passwordIsOwner= false:passwordIsOwner= true:' "${WORKDIR}/${P}"/java_libs/com/lowagie/text/pdf/PdfReader.java || die
+       fi
 }
 
 src_compile() {