diff options
| author |   Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2010-07-10 13:39:24 +0000 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2010-07-10 13:39:24 +0000 |
| commit | 1e8d7ae378304df991666e1164cee5641428c3f2 (patch) | |
| tree | 78a5fa84a476372f4a82cf0dcae1df119b554835 /x11-libs | |
| parent | Use .xpm instead of .png because gentoo-x86 shouldn't have binary data in it. (diff) | |
| download | historical-1e8d7ae378304df991666e1164cee5641428c3f2.tar.gz historical-1e8d7ae378304df991666e1164cee5641428c3f2.tar.bz2 historical-1e8d7ae378304df991666e1164cee5641428c3f2.zip | |
Remove duplicate man files preventing installation with new coreutils
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/xosd/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/xosd/Manifest | 5 | ||||
| -rw-r--r-- | x11-libs/xosd/files/xosd-2.2.14-makefile.patch | 11 | ||||
| -rw-r--r-- | x11-libs/xosd/xosd-2.2.14-r1.ebuild | 5 |
4 files changed, 23 insertions, 6 deletions
diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog index 8288eacc4569..b34887da70fc 100644 --- a/x11-libs/xosd/ChangeLog +++ b/x11-libs/xosd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/xosd -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.78 2009/08/20 02:17:13 vostorga Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.79 2010/07/10 13:39:24 sochotnicky Exp $ + + 10 Jul 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org> + xosd-2.2.14-r1.ebuild, +files/xosd-2.2.14-makefile.patch: + Remove duplicate man files preventing installation with new coreutils 20 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> -files/xosd-2.2.8-libxosd.patch, -files/bmp-dlg_config.patch: diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest index 7cee704f52ba..f66b1e94734c 100644 --- a/x11-libs/xosd/Manifest +++ b/x11-libs/xosd/Manifest @@ -1,7 +1,8 @@ AUX xosd-2.2.14-m4.patch 242 RMD160 fb73151d99d2f0749a2b0415bb2c07d2f139fc60 SHA1 0012052cd1a3f8553f476409522f29188c8be969 SHA256 c6588e7f37aedaad59358bcaa3b0a46ac983b933b2da32230fa5e07479030015 +AUX xosd-2.2.14-makefile.patch 480 RMD160 48eef7b982a8bc9e570a5db5642086fad89b5cca SHA1 78ae5147ad63d6a24d9e9e2c5b0cd56bf3555aa2 SHA256 d0b1e1fdf38041c8cef9d10ebe777a6eeda7150528697fbbaa612ace8d7d7ceb DIST xosd-gentoo-m4-1.tar.bz2 5043 RMD160 6b464fe90adcee353064db37634bde7255dd0426 SHA1 0e00123455bd5bb8221613d6ee0895b607f21c0d SHA256 6cd8c8e8bef4576e332e9f855e5ae7071b4da5e7ce0e96906531784aec2c061f DIST xosd_2.2.14-1.diff.gz 8616 RMD160 a79a47aa50f41c9cfd531c7580b4f175f7b4c068 SHA1 cdba1da203dac3c007836fd0e02c92356e74a075 SHA256 1b74a379030a2a8a1c36b6589023445bc1f620dbfa12ef799590568505f390b2 DIST xosd_2.2.14.orig.tar.gz 418331 RMD160 8a39756c5a46f2897be9bbd47dd86770f42ed648 SHA1 1d459a62239c9fe842d835bb7f60eb2edd7c979f SHA256 4f1fa96f4895baee6a3cba40f188a0da23bbac9d68e8c326d749e084143cb508 -EBUILD xosd-2.2.14-r1.ebuild 1248 RMD160 24b3bc1c2a304fe01213c67523430766ab145446 SHA1 0c7e2f55613356115a0378573c6defae7a72956a SHA256 4b1e2c3a23bf99636c6bf1df56000cc54e4bab36738cbb1a7b240de527e76a8e -MISC ChangeLog 10212 RMD160 f31c06dd3849f85e218f580b928af2b01729c75c SHA1 83b0511f55ef59c8f43762ed8e8fc9d7be6a463a SHA256 5ff6e32147d4bb7fdbc33c00c1f025067115de1f740eaaa83f5795ef6a850766 +EBUILD xosd-2.2.14-r1.ebuild 1296 RMD160 cabe94be50076377119fe4e5070aa485c4d05823 SHA1 2f85fffa48418b566eb6b0d1309f051eb01737b3 SHA256 6aeb5000c4abdf3f0c03dd4ec26f095300263430602e29894c180b8045cc9b19 +MISC ChangeLog 10409 RMD160 2328fe73e56000f2fffcef100af33db2b777dcb9 SHA1 62a395c89cfe86251d234b07a2c6def09cee7fa3 SHA256 d1f8397aec84a83bbc48972a757b7f29ade210349205e6b2788f29f97af4e75c MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85 diff --git a/x11-libs/xosd/files/xosd-2.2.14-makefile.patch b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch new file mode 100644 index 000000000000..ed6da80fbb61 --- /dev/null +++ b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch @@ -0,0 +1,11 @@ +--- xosd-2.2.14/man/Makefile.am ++++ xosd-2.2.14/man/Makefile.am +@@ -3,7 +3,7 @@ + xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \ + xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \ + xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \ +- xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \ ++ xosd_set_horizontal_offset.3 xosd_destroy.3 \ + xosd_set_bar_length.3 + + EXTRA_DIST = ${man_MANS} diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild index ff5f433fcac1..bf62672f43c9 100644 --- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild +++ b/x11-libs/xosd/xosd-2.2.14-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/x11-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.22 2009/03/29 00:05:53 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.23 2010/07/10 13:39:24 sochotnicky Exp $ inherit eutils autotools @@ -29,6 +29,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-m4.patch + epatch "${FILESDIR}"/${P}-makefile.patch epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz AT_M4DIR="${WORKDIR}/m4" eautoreconf |