diff options
| -rw-r--r-- | x11-libs/xosd/ChangeLog | 8 | ||||
| -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 |
3 files changed, 20 insertions, 4 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/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 |