| 1 |
jer 14/07/01 23:16:57 |
| 2 |
|
| 3 |
Modified: redhat-artwork-5.0.8-r4.ebuild metadata.xml |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Fix whitespace. sed must die(). Replace rm -rf with rm -r || die. Remove pointless pkg_postinst() (bug #515424). Fix quoting in sed scripts. Combine sed scripts that touch the same files. I could go on. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.15 x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild?rev=1.15&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild?rev=1.15&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild?r1=1.14&r2=1.15 |
| 16 |
|
| 17 |
Index: redhat-artwork-5.0.8-r4.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild,v |
| 20 |
retrieving revision 1.14 |
| 21 |
retrieving revision 1.15 |
| 22 |
diff -u -r1.14 -r1.15 |
| 23 |
--- redhat-artwork-5.0.8-r4.ebuild 26 Dec 2013 18:51:41 -0000 1.14 |
| 24 |
+++ redhat-artwork-5.0.8-r4.ebuild 1 Jul 2014 23:16:57 -0000 1.15 |
| 25 |
@@ -1,9 +1,9 @@ |
| 26 |
-# Copyright 1999-2013 Gentoo Foundation |
| 27 |
+# Copyright 1999-2014 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild,v 1.14 2013/12/26 18:51:41 creffett Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild,v 1.15 2014/07/01 23:16:57 jer Exp $ |
| 31 |
|
| 32 |
EAPI=5 |
| 33 |
-inherit eutils rpm autotools |
| 34 |
+inherit autotools eutils rpm |
| 35 |
|
| 36 |
MY_R=${PR/r/} |
| 37 |
DESCRIPTION="RedHat's Bluecurve theme for GTK2, KDE, GDM, Metacity and Nautilus" |
| 38 |
@@ -13,16 +13,15 @@ |
| 39 |
|
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86" |
| 42 |
-IUSE="audacious" |
| 43 |
- |
| 44 |
-# See end of src_install(): |
| 45 |
-IUSE="${IUSE} gdm kdm cursors icons nautilus" |
| 46 |
+IUSE="audacious cursors gdm icons kdm nautilus" |
| 47 |
|
| 48 |
RDEPEND="x11-libs/gtk+:2" |
| 49 |
-DEPEND="${RDEPEND} |
| 50 |
- virtual/pkgconfig |
| 51 |
+DEPEND=" |
| 52 |
+ ${RDEPEND} |
| 53 |
dev-util/intltool |
| 54 |
- media-gfx/icon-slicer" |
| 55 |
+ media-gfx/icon-slicer |
| 56 |
+ virtual/pkgconfig |
| 57 |
+" |
| 58 |
|
| 59 |
RESTRICT="test" |
| 60 |
|
| 61 |
@@ -31,45 +30,36 @@ |
| 62 |
} |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
- epatch "${WORKDIR}/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch" |
| 66 |
- epatch "${WORKDIR}/redhat-artwork-5.0.8-echo.patch" |
| 67 |
+ epatch "${WORKDIR}"/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch |
| 68 |
+ epatch "${WORKDIR}"/redhat-artwork-5.0.8-echo.patch |
| 69 |
|
| 70 |
# dies if LANG has UTF-8 |
| 71 |
export LANG=C |
| 72 |
export LC_ALL=C |
| 73 |
|
| 74 |
rm -f configure |
| 75 |
- sed -i -e "s|.*MCOPIDL.*||" \ |
| 76 |
- -e "s|.*ARTSCCONFIG.*||" \ |
| 77 |
- acinclude.m4 |
| 78 |
- |
| 79 |
- sed -i -e "s|KDE_SET_PREFIX||" \ |
| 80 |
- -e "s|KDE_CHECK_FINAL||" \ |
| 81 |
- -e "s|dnl KDE_USE_QT||" \ |
| 82 |
- -e "s|AC_PATH_KDE||" \ |
| 83 |
- -e "s|art/kde/Makefile||" \ |
| 84 |
- -e "s|art/kde/kwin/Makefile||" \ |
| 85 |
- -e "s|art/kde/kwin/Bluecurve/Makefile||" \ |
| 86 |
- configure.in |
| 87 |
- |
| 88 |
- sed -i -e "s|kde||" \ |
| 89 |
- -e "s|qt||" \ |
| 90 |
- art/Makefile.am |
| 91 |
- |
| 92 |
- sed -i -e "s|AM_PATH_GTK(1.2.9, ,||" \ |
| 93 |
- -e "s|AC_MSG_ERROR(.*GTK+-1.*||" \ |
| 94 |
- -e "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,||" \ |
| 95 |
- -e "s|AC_MSG_ERROR(.*gtk_style.*||" \ |
| 96 |
- -e "s| \$GTK_LIBS)||" \ |
| 97 |
- -e "s|AM_PATH_GDK_PIXBUF||" \ |
| 98 |
- -e "s|art/gtk/Bluecurve1/Makefile||" \ |
| 99 |
- -e "s|art/gtk/Bluecurve1/gtk/Makefile||" \ |
| 100 |
- configure.in |
| 101 |
+ sed -i \ |
| 102 |
+ -e 's|.*MCOPIDL.*||' \ |
| 103 |
+ -e 's|.*ARTSCCONFIG.*||' \ |
| 104 |
+ acinclude.m4 || die |
| 105 |
+ |
| 106 |
+ sed -i \ |
| 107 |
+ -e 's|AC_PATH_KDE||' \ |
| 108 |
+ -e 's|KDE_CHECK_FINAL||' \ |
| 109 |
+ -e 's|KDE_SET_PREFIX||' \ |
| 110 |
+ -e 's|art/kde/Makefile||' \ |
| 111 |
+ -e 's|art/kde/kwin/Bluecurve/Makefile||' \ |
| 112 |
+ -e 's|art/kde/kwin/Makefile||' \ |
| 113 |
+ -e 's|dnl KDE_USE_QT||' \ |
| 114 |
+ configure.in || die |
| 115 |
+ |
| 116 |
+ sed -i \ |
| 117 |
+ -e 's|kde||' \ |
| 118 |
+ -e 's|qt||' \ |
| 119 |
+ art/Makefile.am || die |
| 120 |
|
| 121 |
- sed -i -e "s|Bluecurve1||" \ |
| 122 |
- art/gtk/Makefile.am |
| 123 |
- |
| 124 |
- sed -i -e 's| $(datadir)| $(DESTDIR)$(datadir)|' \ |
| 125 |
+ sed -i \ |
| 126 |
+ -e 's| $(datadir)| $(DESTDIR)$(datadir)|' \ |
| 127 |
art/cursor/Bluecurve/Makefile.am \ |
| 128 |
art/cursor/Bluecurve-inverse/Makefile.am \ |
| 129 |
art/cursor/LBluecurve/Makefile.am \ |
| 130 |
@@ -79,58 +69,62 @@ |
| 131 |
|
| 132 |
eautoreconf |
| 133 |
|
| 134 |
- ebegin "Running intltoolize" |
| 135 |
- intltoolize --force || die "intltoolize failed" |
| 136 |
- eend $? |
| 137 |
+ intltoolize --force || die |
| 138 |
|
| 139 |
- sed -i -e "s|GtkStyle|4|" art/qt/Bluecurve/bluecurve.cpp || die |
| 140 |
+ sed -i -e 's|GtkStyle|4|' art/qt/Bluecurve/bluecurve.cpp || die |
| 141 |
} |
| 142 |
|
| 143 |
src_compile() { |
| 144 |
- emake QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" || die |
| 145 |
+ emake QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" |
| 146 |
} |
| 147 |
|
| 148 |
src_install () { |
| 149 |
- |
| 150 |
# dies if LANG has UTF-8 |
| 151 |
export LANG=C |
| 152 |
export LC_ALL=C |
| 153 |
|
| 154 |
- make QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" \ |
| 155 |
- DESTDIR="${D}" install || die |
| 156 |
+ emake \ |
| 157 |
+ QTDIR="${QTDIR}" \ |
| 158 |
+ styledir="${QTDIR}/plugins/styles" \ |
| 159 |
+ DESTDIR="${D}" \ |
| 160 |
+ install |
| 161 |
|
| 162 |
# yank redhat logos (registered trademarks, etc) |
| 163 |
rm -f "${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png" |
| 164 |
rm -f "${D}/usr/share/gdm/themes/Bluecurve/screenshot.png" |
| 165 |
|
| 166 |
- cd "${D}/usr/share/gdm/themes/Bluecurve/" |
| 167 |
+ cd "${D}/usr/share/gdm/themes/Bluecurve/" || die |
| 168 |
|
| 169 |
# replace redhat logo with gnome logo from happygnome theme, use .svg if >=gnome-base/gdm-2.14 installed |
| 170 |
if has_version gnome-base/gdm >=2.14; then |
| 171 |
- sed -i -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.svg"/>|' \ |
| 172 |
- -e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml || die |
| 173 |
+ sed -i \ |
| 174 |
+ -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.svg"/>|' \ |
| 175 |
+ -e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml \ |
| 176 |
+ || die |
| 177 |
else |
| 178 |
- sed -i -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \ |
| 179 |
- -e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml || die |
| 180 |
+ sed -i \ |
| 181 |
+ -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \ |
| 182 |
+ -e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml \ |
| 183 |
+ || die |
| 184 |
fi |
| 185 |
|
| 186 |
# Bluecurve GDM screenshot has redhat logo |
| 187 |
# Theme copyright notice left intact... do not modify it |
| 188 |
- sed -i -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop |
| 189 |
+ sed -i -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop || die |
| 190 |
|
| 191 |
X11_IMPLEM="xorg-x11" |
| 192 |
|
| 193 |
for x in Bluecurve Bluecurve-inverse; do |
| 194 |
dodir /usr/share/cursors/${X11_IMPLEM}/${x} |
| 195 |
- mv "${D}/usr/share/icons/${x}/cursors" "${D}/usr/share/cursors/${X11_IMPLEM}/${x}" |
| 196 |
+ mv "${D}"/usr/share/icons/${x}/cursors "${D}"/usr/share/cursors/${X11_IMPLEM}/${x} |
| 197 |
dosym /usr/share/cursors/${X11_IMPLEM}/${x}/cursors /usr/share/icons/${x}/cursors |
| 198 |
done |
| 199 |
|
| 200 |
# remove audacious skin if unneeded |
| 201 |
if ! use audacious; then |
| 202 |
- rm -rf "${D}/usr/share/xmms" |
| 203 |
+ rm -r "${D}"/usr/share/xmms || die |
| 204 |
else |
| 205 |
- mv "${D}/usr/share/xmms" "${D}/usr/share/audacious" |
| 206 |
+ mv "${D}"/usr/share/xmms "${D}"/usr/share/audacious || die |
| 207 |
fi |
| 208 |
|
| 209 |
cd "${S}" |
| 210 |
@@ -139,26 +133,12 @@ |
| 211 |
### |
| 212 |
# Some extra features - allows redhat-artwork to be very light: |
| 213 |
### |
| 214 |
- use gdm || rm -rf "${D}/usr/share/gdm" |
| 215 |
- use kdm || rm -rf "${D}/usr/share/apps/kdm" |
| 216 |
- use cursors || rm -rf "${D}/usr/share/cursors" |
| 217 |
- use icons || { |
| 218 |
- rm -rf "${D}"/usr/share/icons |
| 219 |
- rm -rf "${D}"/usr/share/pixmaps/*.png |
| 220 |
- } |
| 221 |
- use nautilus || rm -rf "${D}/usr/share/pixmaps/nautilus" |
| 222 |
- |
| 223 |
-} |
| 224 |
- |
| 225 |
-pkg_postinst() { |
| 226 |
- |
| 227 |
- einfo |
| 228 |
- einfo "This version provides more control over what is installed" |
| 229 |
- einfo "than previous version." |
| 230 |
- einfo |
| 231 |
- einfo "Please check your USE flags." |
| 232 |
- einfo |
| 233 |
- |
| 234 |
- epause |
| 235 |
- |
| 236 |
+ if ! use gdm; then rm -r "${D}"/usr/share/gdm || die; fi |
| 237 |
+ if ! use kdm; then rm -r "${D}"/usr/share/apps/kdm || die; fi |
| 238 |
+ if ! use cursors; then rm -r "${D}"/usr/share/cursors || die; fi |
| 239 |
+ if ! use icons; then |
| 240 |
+ rm -r "${D}"/usr/share/icons || die |
| 241 |
+ rm -r "${D}"/usr/share/pixmaps/*.png || die |
| 242 |
+ fi |
| 243 |
+ if ! use nautilus; then rm -r "${D}"/usr/share/pixmaps/nautilus || die; fi |
| 244 |
} |
| 245 |
|
| 246 |
|
| 247 |
|
| 248 |
1.4 x11-themes/redhat-artwork/metadata.xml |
| 249 |
|
| 250 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/metadata.xml?rev=1.4&view=markup |
| 251 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/metadata.xml?rev=1.4&content-type=text/plain |
| 252 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/metadata.xml?r1=1.3&r2=1.4 |
| 253 |
|
| 254 |
Index: metadata.xml |
| 255 |
=================================================================== |
| 256 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/metadata.xml,v |
| 257 |
retrieving revision 1.3 |
| 258 |
retrieving revision 1.4 |
| 259 |
diff -u -r1.3 -r1.4 |
| 260 |
--- metadata.xml 21 Aug 2008 22:16:06 -0000 1.3 |
| 261 |
+++ metadata.xml 1 Jul 2014 23:16:57 -0000 1.4 |
| 262 |
@@ -2,19 +2,12 @@ |
| 263 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 264 |
<pkgmetadata> |
| 265 |
<herd>desktop-misc</herd> |
| 266 |
-<!-- |
| 267 |
-he doesn't seem to be actively maintaining it, so smithj removed him as |
| 268 |
-maintainer: |
| 269 |
- |
| 270 |
-<maintainer><email>liquidx@g.o</email></maintainer> |
| 271 |
---> |
| 272 |
<use> |
| 273 |
- <flag name='audacious'>Install <pkg>media-sound/audacious</pkg> theme</flag> |
| 274 |
- <flag name='cursors'>Install Bluecurve cursors</flag> |
| 275 |
- <flag name='gdm'>Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag> |
| 276 |
- <flag name='icons'>Install Bluecurve icons</flag> |
| 277 |
- <flag name='kdm'>Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag> |
| 278 |
- <flag name='nautilus'>Install Bluecurve <pkg>gnome-base/nautilus</pkg> |
| 279 |
- icons</flag> |
| 280 |
+<flag name='audacious'>Install <pkg>media-sound/audacious</pkg> theme</flag> |
| 281 |
+<flag name='cursors'>Install Bluecurve cursors</flag> |
| 282 |
+<flag name='gdm'>Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag> |
| 283 |
+<flag name='icons'>Install Bluecurve icons</flag> |
| 284 |
+<flag name='kdm'>Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag> |
| 285 |
+<flag name='nautilus'>Install Bluecurve <pkg>gnome-base/nautilus</pkg> icons</flag> |
| 286 |
</use> |
| 287 |
</pkgmetadata> |
| 288 |
|
| 289 |
|
| 290 |
|
| 291 |
1.106 x11-themes/redhat-artwork/ChangeLog |
| 292 |
|
| 293 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/ChangeLog?rev=1.106&view=markup |
| 294 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/ChangeLog?rev=1.106&content-type=text/plain |
| 295 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/ChangeLog?r1=1.105&r2=1.106 |
| 296 |
|
| 297 |
Index: ChangeLog |
| 298 |
=================================================================== |
| 299 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v |
| 300 |
retrieving revision 1.105 |
| 301 |
retrieving revision 1.106 |
| 302 |
diff -u -r1.105 -r1.106 |
| 303 |
--- ChangeLog 26 Dec 2013 18:51:41 -0000 1.105 |
| 304 |
+++ ChangeLog 1 Jul 2014 23:16:57 -0000 1.106 |
| 305 |
@@ -1,6 +1,12 @@ |
| 306 |
# ChangeLog for x11-themes/redhat-artwork |
| 307 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 308 |
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.105 2013/12/26 18:51:41 creffett Exp $ |
| 309 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 310 |
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.106 2014/07/01 23:16:57 jer Exp $ |
| 311 |
+ |
| 312 |
+ 01 Jul 2014; Jeroen Roovers <jer@g.o> redhat-artwork-5.0.8-r4.ebuild, |
| 313 |
+ metadata.xml: |
| 314 |
+ Fix whitespace. sed must die(). Replace rm -rf with rm -r || die. Remove |
| 315 |
+ pointless pkg_postinst() (bug #515424). Fix quoting in sed scripts. Combine |
| 316 |
+ sed scripts that touch the same files. I could go on. |
| 317 |
|
| 318 |
26 Dec 2013; Chris Reffett <creffett@g.o> |
| 319 |
redhat-artwork-5.0.8-r4.ebuild: |
Archives