xpdf: minor updates.

- Remove deprecated item from desktop entry.
- Don't install unused documentation.
- Install sample xpdfrc in docdir.
- Ebuild cleanup
- Remove old

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 053656c369c955bec5d20ef558d61399fe3fd51a..37e5f44416fa13b0ba144e51eeb7b21cbecaa095 100644 (file)
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,6 +1,4 @@
 AUX xpdf-Add-Gentoo-font-path.patch 914 SHA256 291265ef0699050ca02329bfec5dab884cf12668f3d050744575ae9429fcdb16 SHA512 8aa45a2ae21fd92dc71c1a5a5e8afec1a91933889ed17f18da6d2b248df27a6651e599e43674cd9fdc16282f8fa197b46ea010588a5a55df068ba51b47d37166 WHIRLPOOL 4308c3a5330d75aa44dbe56c7ceb39a94abf6ff0ebfe359d3feaa5f2df92a6088056bd070aaeac9235744aa70ac5716f8985f19f621b7654a2a839a5ba67823c
-AUX xpdf.desktop 2907 SHA256 321726e47e4a782a3788778b10db4f2dba4e3d252b5f268ef3325a8a4fe9d018 SHA512 a06c1f0f9d4949d4bba4484bd53e1c69b550d9969f4b89e7837a2e26001a7016aee49861bbdf1a2b490c1aec442898f7bcfae68a3a1377976249559da9b9cb19 WHIRLPOOL eb87831707da91db127a69eb296624cdcd32148f777089d9d5a55801fd6f4cc5dcab117f58fbdf6616078d308176885a786424cbde0bd167370369337bc46e66
-DIST xpdf-3.03.tar.gz 795537 SHA256 02cf63d8f6326eda644096cd0f969e1588702ad87222c1e9388a93c270fbceca SHA512 5f4ed091c21d7f28e0fdd70558f14ea168b5020a94c7195cf78197348e677d758552bc2721749ee6724421ed14a86259e6374148934b6ab6f5f3b998f44a47bd WHIRLPOOL 23f99cc662f24d9a7a27bc4b09ddcb3d3a393bffc85d2f6a0ad5a6a2f0826d476c1e1b69fb33a891de33a1a79e5590e67b91796950c691a2ab179c7569735fa8
+AUX xpdf.desktop 2892 SHA256 3f3fc98969317d5082a91af51df69df8a6b5d172cda7aa73f4ee91ac7643b0f0 SHA512 320d34f0a5f73da571140fe450f5bd2d473def70781920b702714933aaab8d4d735cc3ea252b2b13355b639158eecd9a7ec48d4de53946f1675fc2230b012f4d WHIRLPOOL 94bd33dc06056c87b6bc32a8ddfb4a76983a6a147172c331d3a30a440e5b6c54e9200498bdce7e3f4fa030a69782081f8843335043c67ba80ebaacb4824178f3
 DIST xpdf-3.04.tar.gz 825519 SHA256 11390c74733abcb262aaca4db68710f13ffffd42bfe2a0861a5dfc912b2977e5 SHA512 3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf WHIRLPOOL 0787d42de82f7907a4f7a0e35aa7d95366db003628857da01ed12b3c7008ce88cdfb2dd6a08155b9a6b9bfd1b70c8aedf67b0b1fd41a77f17253576b1d3aac4a
-EBUILD xpdf-3.03.ebuild 803 SHA256 c729805f1495d8e8bcf1487444f7824d3a78ebfbb804b06418f6925fcf4f416d SHA512 3e9552d04964edafaefb9bfaaff08e823a8524386a7eeede0ff861fc6562dff59653b2b3ce76d37134767162d58546008dd3f666fc4810edf1001e7fff012712 WHIRLPOOL 5972cb615f2336d14385e3df2cb3b4877c59710bb6fd6f5dbddda19abc26eeb7183ba88e139bca440b74346cf77889b2f0751abc60a93fe770d9b94a9eab3a82
-EBUILD xpdf-3.04.ebuild 803 SHA256 ed93938475e053e980f36e89dddb5862acc7ca0ee18db7d9246ed6fae48d1996 SHA512 56e1deddc94aef2a3188e8c0160cab78733dbe217fd321f5fb57e5914233481499e9e49779ef635fc58c6dee3a0a928f6c7ed0c34e2bc7ce2951fe6e917d1c82 WHIRLPOOL ca2594498c286af591338ef8d5963917356b57d41298d5eed72edf04fc318b6eecb6d49f0261fc18511d71afeaebbc52b73e98aafa24894158dfb33dc7490abe
+EBUILD xpdf-3.04-r1.ebuild 991 SHA256 d2b47b8d4e4acb9fc7ab17f3fda701ca332740eeba23f8a5bd4c944dc6bbdd34 SHA512 ded78a79b99defe9227a0d1d6d311604cbcf23a99bc9e0adbb7a857832c7c61b519f7a4193115c660f9024581a9be18781f17945e0f9c41511e7ebfe94f02e3a WHIRLPOOL 5cea48555efea3d1e900f1565cffe29053dec9bf88e6bc4bb190010728bfee0eedad216642dfbca00079e3b583be4a548ae05607d833f273295e9f358011b7a2

diff --git a/app-text/xpdf/files/xpdf.desktop b/app-text/xpdf/files/xpdf.desktop
index c8b5e2783f07cd9502ec2e94cb521372960622fa..db42e86941739f6a1cfbf223b99c653a2f9eeba4 100644 (file)
--- a/app-text/xpdf/files/xpdf.desktop
+++ b/app-text/xpdf/files/xpdf.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Encoding=UTF-8
-BinaryPattern=
 Name=Xpdf
 Name[af]=X Pdf
 Name[bn]=এক্স পি-ডি-এফ

diff --git a/app-text/xpdf/xpdf-3.03.ebuild b/app-text/xpdf/xpdf-3.03.ebuild
deleted file mode 100644 (file)
index 6995200..0000000
--- a/app-text/xpdf/xpdf-3.03.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="An X viewer for PDF files"
-HOMEPAGE="http://www.foolabs.com/xpdf/"
-SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=x11-libs/motif-2.3:0
-       media-libs/freetype:2
-       app-text/libpaper
-       x11-libs/libX11
-       x11-libs/libXpm"
-RDEPEND="${DEPEND}
-       media-fonts/urw-fonts"
-
-src_prepare() {
-       epatch "${FILESDIR}"/xpdf-Add-Gentoo-font-path.patch
-}
-
-src_configure() {
-       econf --with-freetype2-includes=/usr/include/freetype2
-}
-
-src_install() {
-       dobin xpdf/xpdf
-       doman doc/xpdf.1
-       doman doc/xpdfrc.5
-       dodoc COPYING COPYING3 README ANNOUNCE CHANGES
-       newicon xpdf/xpdfIcon.xpm xpdf.xpm
-
-       insinto /etc
-       newins doc/sample-xpdfrc xpdfrc
-
-       insinto /usr/share/applications
-       doins "${FILESDIR}"/xpdf.desktop
-}

diff --git a/app-text/xpdf/xpdf-3.04.ebuild b/app-text/xpdf/xpdf-3.04-r1.ebuild
similarity index 64%
rename from app-text/xpdf/xpdf-3.04.ebuild
rename to app-text/xpdf/xpdf-3.04-r1.ebuild
index 7378dc8b550f7450e58db4c1bf6bf3ea1224bc63..bb248211dd2f6adc777b2949b6a9041159681430 100644 (file)
--- a/app-text/xpdf/xpdf-3.04.ebuild
+++ b/app-text/xpdf/xpdf-3.04-r1.ebuild
@@ -1,3 +1,7 @@
+# Copyright © 2012, 2014-2015 Nick Bowler
+# License GPLv3+: GNU General Public License version 3 or later.
+# There is NO WARRANTY, to the extent permitted by law.
+
 EAPI=5
 
 inherit eutils
@@ -9,18 +13,18 @@ SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz"
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND=">=x11-libs/motif-2.3:0
        media-libs/freetype:2
        app-text/libpaper
        x11-libs/libX11
        x11-libs/libXpm"
-RDEPEND="${DEPEND}
+RDEPEND="$DEPEND
        media-fonts/urw-fonts"
 
 src_prepare() {
-       epatch "${FILESDIR}"/xpdf-Add-Gentoo-font-path.patch
+       epatch "$FILESDIR/xpdf-Add-Gentoo-font-path.patch"
+       epatch_user
 }
 
 src_configure() {
@@ -31,12 +35,13 @@ src_install() {
        dobin xpdf/xpdf
        doman doc/xpdf.1
        doman doc/xpdfrc.5
-       dodoc COPYING COPYING3 README ANNOUNCE CHANGES
+       dodoc README ANNOUNCE CHANGES
        newicon xpdf/xpdfIcon.xpm xpdf.xpm
 
        insinto /etc
        newins doc/sample-xpdfrc xpdfrc
+       newdoc doc/sample-xpdfrc xpdfrc.example
 
        insinto /usr/share/applications
-       doins "${FILESDIR}"/xpdf.desktop
+       doins "$FILESDIR/xpdf.desktop"
 }