| 1 |
drac 08/05/07 19:03:33 |
| 2 |
|
| 3 |
Modified: xscreensaver-5.05.ebuild ChangeLog |
| 4 |
Added: xscreensaver-5.05-r1.ebuild |
| 5 |
Log: |
| 6 |
Remove NotShowIn=GNOME; and use xscreensaver.xpm for unique appearance in desktop entry. Split -5.04-gentoo.patch into separate patches. Add directory for cracklib-words. Fix bug with Xinerama wrt bug #219172. |
| 7 |
(Portage version: 2.1.5_rc6) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.11 x11-misc/xscreensaver/xscreensaver-5.05.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild?rev=1.11&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild?rev=1.11&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild?r1=1.10&r2=1.11 |
| 15 |
|
| 16 |
Index: xscreensaver-5.05.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v |
| 19 |
retrieving revision 1.10 |
| 20 |
retrieving revision 1.11 |
| 21 |
diff -u -r1.10 -r1.11 |
| 22 |
--- xscreensaver-5.05.ebuild 20 Apr 2008 02:30:26 -0000 1.10 |
| 23 |
+++ xscreensaver-5.05.ebuild 7 May 2008 19:03:33 -0000 1.11 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v 1.10 2008/04/20 02:30:26 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v 1.11 2008/05/07 19:03:33 drac Exp $ |
| 29 |
|
| 30 |
inherit autotools eutils flag-o-matic multilib pam |
| 31 |
|
| 32 |
@@ -40,12 +40,7 @@ |
| 33 |
src_unpack() { |
| 34 |
unpack ${A} |
| 35 |
cd "${S}" |
| 36 |
- # phew, posted everything to upstream so lets |
| 37 |
- # see what version 5.06 brings us.. |
| 38 |
- epatch "${FILESDIR}"/${PN}-5.04-gentoo.patch |
| 39 |
- epatch "${FILESDIR}"/${PN}-5.04-nsfw.patch |
| 40 |
- epatch "${FILESDIR}"/${P}-desktop-entry.patch |
| 41 |
- epatch "${FILESDIR}"/${P}-posix-head.patch |
| 42 |
+ EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="07_all_xinerama.patch" epatch "${FILESDIR}"/${PV} |
| 43 |
eautoreconf # bug 113681 |
| 44 |
} |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.233 x11-misc/xscreensaver/ChangeLog |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.233&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.233&content-type=text/plain |
| 53 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?r1=1.232&r2=1.233 |
| 54 |
|
| 55 |
Index: ChangeLog |
| 56 |
=================================================================== |
| 57 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v |
| 58 |
retrieving revision 1.232 |
| 59 |
retrieving revision 1.233 |
| 60 |
diff -u -r1.232 -r1.233 |
| 61 |
--- ChangeLog 2 Apr 2008 17:48:04 -0000 1.232 |
| 62 |
+++ ChangeLog 7 May 2008 19:03:33 -0000 1.233 |
| 63 |
@@ -1,6 +1,19 @@ |
| 64 |
# ChangeLog for x11-misc/xscreensaver |
| 65 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.232 2008/04/02 17:48:04 armin76 Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.233 2008/05/07 19:03:33 drac Exp $ |
| 68 |
+ |
| 69 |
+*xscreensaver-5.05-r1 (07 May 2008) |
| 70 |
+ |
| 71 |
+ 07 May 2008; Samuli Suominen <drac@g.o> |
| 72 |
+ +files/5.05/01_all_default_settings.patch, |
| 73 |
+ +files/5.05/03_all_desktop_entry.patch, |
| 74 |
+ +files/5.05/05_all_offensive.patch, |
| 75 |
+ +files/5.05/02_all_cracklib_words.patch, |
| 76 |
+ +files/5.05/04_all_posix_head.patch, +files/5.05/06_all_rpm.patch, |
| 77 |
+ +files/5.05/07_all_xinerama.patch, +xscreensaver-5.05-r1.ebuild: |
| 78 |
+ Remove NotShowIn=GNOME; and use xscreensaver.xpm for unique appearance in |
| 79 |
+ desktop entry. Split -5.04-gentoo.patch into separate patches. Add |
| 80 |
+ directory for cracklib-words. Fix bug with Xinerama wrt bug #219172. |
| 81 |
|
| 82 |
02 Apr 2008; Raúl Porcel <armin76@g.o> xscreensaver-5.05.ebuild: |
| 83 |
ia64 stable |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.1 x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild?rev=1.1&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild?rev=1.1&content-type=text/plain |
| 91 |
|
| 92 |
Index: xscreensaver-5.05-r1.ebuild |
| 93 |
=================================================================== |
| 94 |
# Copyright 1999-2008 Gentoo Foundation |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild,v 1.1 2008/05/07 19:03:33 drac Exp $ |
| 97 |
|
| 98 |
inherit autotools eutils flag-o-matic multilib pam |
| 99 |
|
| 100 |
DESCRIPTION="A modular screen saver and locker for the X Window System" |
| 101 |
SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" |
| 102 |
HOMEPAGE="http://www.jwz.org/xscreensaver" |
| 103 |
|
| 104 |
LICENSE="BSD" |
| 105 |
SLOT="0" |
| 106 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
| 107 |
IUSE="jpeg new-login opengl pam suid xinerama" |
| 108 |
|
| 109 |
RDEPEND="x11-libs/libXmu |
| 110 |
x11-libs/libXxf86vm |
| 111 |
x11-libs/libXrandr |
| 112 |
x11-libs/libXxf86misc |
| 113 |
x11-libs/libXt |
| 114 |
x11-libs/libX11 |
| 115 |
x11-libs/libXext |
| 116 |
x11-apps/xwininfo |
| 117 |
x11-apps/appres |
| 118 |
media-libs/netpbm |
| 119 |
>=dev-libs/libxml2-2.5 |
| 120 |
>=x11-libs/gtk+-2 |
| 121 |
>=gnome-base/libglade-1.99 |
| 122 |
pam? ( virtual/pam ) |
| 123 |
jpeg? ( media-libs/jpeg ) |
| 124 |
opengl? ( virtual/opengl ) |
| 125 |
xinerama? ( x11-libs/libXinerama ) |
| 126 |
new-login? ( gnome-base/gdm )" |
| 127 |
DEPEND="${RDEPEND} |
| 128 |
x11-proto/xf86vidmodeproto |
| 129 |
x11-proto/xextproto |
| 130 |
x11-proto/scrnsaverproto |
| 131 |
x11-proto/recordproto |
| 132 |
x11-proto/xf86miscproto |
| 133 |
sys-devel/bc |
| 134 |
dev-util/pkgconfig |
| 135 |
sys-devel/gettext |
| 136 |
dev-util/intltool |
| 137 |
xinerama? ( x11-proto/xineramaproto )" |
| 138 |
|
| 139 |
src_unpack() { |
| 140 |
unpack ${A} |
| 141 |
cd "${S}" |
| 142 |
EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV} |
| 143 |
eautoreconf # bug 113681 |
| 144 |
} |
| 145 |
|
| 146 |
src_compile() { |
| 147 |
if use ppc || use ppc64; then |
| 148 |
# Still fails to build "flurry" screensaver. |
| 149 |
filter-flags -mabi=altivec |
| 150 |
filter-flags -maltivec |
| 151 |
append-flags -U__VEC__ |
| 152 |
fi |
| 153 |
|
| 154 |
unset BC_ENV_ARGS |
| 155 |
|
| 156 |
econf \ |
| 157 |
--with-x-app-defaults=/usr/share/X11/app-defaults \ |
| 158 |
--with-hackdir=/usr/$(get_libdir)/misc/${PN} \ |
| 159 |
--with-configdir=/usr/share/${PN}/config \ |
| 160 |
--x-libraries=/usr/$(get_libdir) \ |
| 161 |
--x-includes=/usr/include \ |
| 162 |
--with-dpms-ext \ |
| 163 |
--with-xf86vmode-ext \ |
| 164 |
--with-xf86gamma-ext \ |
| 165 |
--with-randr-ext \ |
| 166 |
--with-proc-interrupts \ |
| 167 |
--with-xpm \ |
| 168 |
--with-xshm-ext \ |
| 169 |
--with-xdbe-ext \ |
| 170 |
--enable-locking \ |
| 171 |
--without-kerberos \ |
| 172 |
--without-gle \ |
| 173 |
--with-gtk \ |
| 174 |
$(use_with suid setuid-hacks) \ |
| 175 |
$(use_with new-login login-manager) \ |
| 176 |
$(use_with xinerama xinerama-ext) \ |
| 177 |
$(use_with pam) \ |
| 178 |
$(use_with opengl gl) \ |
| 179 |
$(use_with jpeg) |
| 180 |
|
| 181 |
emake -j1 || die "emake failed." # bug 155049 |
| 182 |
} |
| 183 |
|
| 184 |
src_install() { |
| 185 |
emake install_prefix="${D}" install || die "emake install failed." |
| 186 |
|
| 187 |
dodoc README{,.hacking} |
| 188 |
|
| 189 |
use pam && fperms 755 /usr/bin/${PN} |
| 190 |
pamd_mimic_system ${PN} auth |
| 191 |
|
| 192 |
# bug 135549 |
| 193 |
rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml |
| 194 |
dodir /usr/share/man/man6x |
| 195 |
mv "${D}"/usr/share/man/man6/worm.6 \ |
| 196 |
"${D}"/usr/share/man/man6x/worm.6x |
| 197 |
} |
| 198 |
|
| 199 |
|
| 200 |
|
| 201 |
-- |
| 202 |
gentoo-commits@l.g.o mailing list |
Archives