jer 14/07/01 23:16:57
Modified: redhat-artwork-5.0.8-r4.ebuild metadata.xml
ChangeLog
Log:
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.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.15 x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
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
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
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
Index: redhat-artwork-5.0.8-r4.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- redhat-artwork-5.0.8-r4.ebuild 26 Dec 2013 18:51:41 -0000 1.14
+++ redhat-artwork-5.0.8-r4.ebuild 1 Jul 2014 23:16:57 -0000 1.15
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
-inherit eutils rpm autotools
+inherit autotools eutils rpm
MY_R=${PR/r/}
DESCRIPTION="RedHat's Bluecurve theme for GTK2, KDE, GDM, Metacity and
Nautilus"
@@ -13,16 +13,15 @@
SLOT="0"
KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
-IUSE="audacious"
-
-# See end of src_install():
-IUSE="${IUSE} gdm kdm cursors icons nautilus"
+IUSE="audacious cursors gdm icons kdm nautilus"
RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="
+ ${RDEPEND}
dev-util/intltool
- media-gfx/icon-slicer"
+ media-gfx/icon-slicer
+ virtual/pkgconfig
+"
RESTRICT="test"
@@ -31,45 +30,36 @@
}
src_prepare() {
- epatch
"${WORKDIR}/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch"
- epatch "${WORKDIR}/redhat-artwork-5.0.8-echo.patch"
+ epatch
"${WORKDIR}"/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch
+ epatch "${WORKDIR}"/redhat-artwork-5.0.8-echo.patch
# dies if LANG has UTF-8
export LANG=C
export LC_ALL=C
rm -f configure
- sed -i -e "s|.*MCOPIDL.*||" \
- -e "s|.*ARTSCCONFIG.*||" \
- acinclude.m4
-
- sed -i -e "s|KDE_SET_PREFIX||" \
- -e "s|KDE_CHECK_FINAL||" \
- -e "s|dnl KDE_USE_QT||" \
- -e "s|AC_PATH_KDE||" \
- -e "s|art/kde/Makefile||" \
- -e "s|art/kde/kwin/Makefile||" \
- -e "s|art/kde/kwin/Bluecurve/Makefile||" \
- configure.in
-
- sed -i -e "s|kde||" \
- -e "s|qt||" \
- art/Makefile.am
-
- sed -i -e "s|AM_PATH_GTK(1.2.9, ,||" \
- -e "s|AC_MSG_ERROR(.*GTK+-1.*||" \
- -e "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental,
:,||" \
- -e "s|AC_MSG_ERROR(.*gtk_style.*||" \
- -e "s| \$GTK_LIBS)||" \
- -e "s|AM_PATH_GDK_PIXBUF||" \
- -e "s|art/gtk/Bluecurve1/Makefile||" \
- -e "s|art/gtk/Bluecurve1/gtk/Makefile||" \
- configure.in
+ sed -i \
+ -e 's|.*MCOPIDL.*||' \
+ -e 's|.*ARTSCCONFIG.*||' \
+ acinclude.m4 || die
+
+ sed -i \
+ -e 's|AC_PATH_KDE||' \
+ -e 's|KDE_CHECK_FINAL||' \
+ -e 's|KDE_SET_PREFIX||' \
+ -e 's|art/kde/Makefile||' \
+ -e 's|art/kde/kwin/Bluecurve/Makefile||' \
+ -e 's|art/kde/kwin/Makefile||' \
+ -e 's|dnl KDE_USE_QT||' \
+ configure.in || die
+
+ sed -i \
+ -e 's|kde||' \
+ -e 's|qt||' \
+ art/Makefile.am || die
- sed -i -e "s|Bluecurve1||" \
- art/gtk/Makefile.am
-
- sed -i -e 's| $(datadir)| $(DESTDIR)$(datadir)|' \
+ sed -i \
+ -e 's| $(datadir)| $(DESTDIR)$(datadir)|' \
art/cursor/Bluecurve/Makefile.am \
art/cursor/Bluecurve-inverse/Makefile.am \
art/cursor/LBluecurve/Makefile.am \
@@ -79,58 +69,62 @@
eautoreconf
- ebegin "Running intltoolize"
- intltoolize --force || die "intltoolize failed"
- eend $?
+ intltoolize --force || die
- sed -i -e "s|GtkStyle|4|" art/qt/Bluecurve/bluecurve.cpp || die
+ sed -i -e 's|GtkStyle|4|' art/qt/Bluecurve/bluecurve.cpp || die
}
src_compile() {
- emake QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" || die
+ emake QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles"
}
src_install () {
-
# dies if LANG has UTF-8
export LANG=C
export LC_ALL=C
- make QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" \
- DESTDIR="${D}" install || die
+ emake \
+ QTDIR="${QTDIR}" \
+ styledir="${QTDIR}/plugins/styles" \
+ DESTDIR="${D}" \
+ install
# yank redhat logos (registered trademarks, etc)
rm -f "${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png"
rm -f "${D}/usr/share/gdm/themes/Bluecurve/screenshot.png"
- cd "${D}/usr/share/gdm/themes/Bluecurve/"
+ cd "${D}/usr/share/gdm/themes/Bluecurve/" || die
# replace redhat logo with gnome logo from happygnome theme, use .svg
if >=gnome-base/gdm-2.14 installed
if has_version gnome-base/gdm >=2.14; then
- sed -i -e 's|<normal file="rh_logo-header.png"/>|<normal
file="/usr/share/gdm/themes/happygnome/gnome-logo.svg"/>|' \
- -e 's|<pos x="3%" y="5%" width="398" height="128"
anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml || die
+ sed -i \
+ -e 's|<normal file="rh_logo-header.png"/>|<normal
file="/usr/share/gdm/themes/happygnome/gnome-logo.svg"/>|' \
+ -e 's|<pos x="3%" y="5%" width="398" height="128"
anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml \
+ || die
else
- sed -i -e 's|<normal file="rh_logo-header.png"/>|<normal
file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
- -e 's|<pos x="3%" y="5%" width="398" height="128"
anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml || die
+ sed -i \
+ -e 's|<normal file="rh_logo-header.png"/>|<normal
file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
+ -e 's|<pos x="3%" y="5%" width="398" height="128"
anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml \
+ || die
fi
# Bluecurve GDM screenshot has redhat logo
# Theme copyright notice left intact... do not modify it
- sed -i -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop
+ sed -i -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop || die
X11_IMPLEM="xorg-x11"
for x in Bluecurve Bluecurve-inverse; do
dodir /usr/share/cursors/${X11_IMPLEM}/${x}
- mv "${D}/usr/share/icons/${x}/cursors"
"${D}/usr/share/cursors/${X11_IMPLEM}/${x}"
+ mv "${D}"/usr/share/icons/${x}/cursors
"${D}"/usr/share/cursors/${X11_IMPLEM}/${x}
dosym /usr/share/cursors/${X11_IMPLEM}/${x}/cursors
/usr/share/icons/${x}/cursors
done
# remove audacious skin if unneeded
if ! use audacious; then
- rm -rf "${D}/usr/share/xmms"
+ rm -r "${D}"/usr/share/xmms || die
else
- mv "${D}/usr/share/xmms" "${D}/usr/share/audacious"
+ mv "${D}"/usr/share/xmms "${D}"/usr/share/audacious || die
fi
cd "${S}"
@@ -139,26 +133,12 @@
###
# Some extra features - allows redhat-artwork to be very light:
###
- use gdm || rm -rf "${D}/usr/share/gdm"
- use kdm || rm -rf "${D}/usr/share/apps/kdm"
- use cursors || rm -rf "${D}/usr/share/cursors"
- use icons || {
- rm -rf "${D}"/usr/share/icons
- rm -rf "${D}"/usr/share/pixmaps/*.png
- }
- use nautilus || rm -rf "${D}/usr/share/pixmaps/nautilus"
-
-}
-
-pkg_postinst() {
-
- einfo
- einfo "This version provides more control over what is installed"
- einfo "than previous version."
- einfo
- einfo "Please check your USE flags."
- einfo
-
- epause
-
+ if ! use gdm; then rm -r "${D}"/usr/share/gdm || die; fi
+ if ! use kdm; then rm -r "${D}"/usr/share/apps/kdm || die; fi
+ if ! use cursors; then rm -r "${D}"/usr/share/cursors || die; fi
+ if ! use icons; then
+ rm -r "${D}"/usr/share/icons || die
+ rm -r "${D}"/usr/share/pixmaps/*.png || die
+ fi
+ if ! use nautilus; then rm -r "${D}"/usr/share/pixmaps/nautilus || die;
fi
}
1.4 x11-themes/redhat-artwork/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/metadata.xml?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/metadata.xml?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 21 Aug 2008 22:16:06 -0000 1.3
+++ metadata.xml 1 Jul 2014 23:16:57 -0000 1.4
@@ -2,19 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<herd>desktop-misc</herd>
-<!--
-he doesn't seem to be actively maintaining it, so smithj removed him as
-maintainer:
-
-<maintainer><email>[email protected]</email></maintainer>
--->
<use>
- <flag name='audacious'>Install <pkg>media-sound/audacious</pkg>
theme</flag>
- <flag name='cursors'>Install Bluecurve cursors</flag>
- <flag name='gdm'>Install Bluecurve <pkg>gnome-base/gdm</pkg>
theme</flag>
- <flag name='icons'>Install Bluecurve icons</flag>
- <flag name='kdm'>Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag>
- <flag name='nautilus'>Install Bluecurve <pkg>gnome-base/nautilus</pkg>
- icons</flag>
+<flag name='audacious'>Install <pkg>media-sound/audacious</pkg> theme</flag>
+<flag name='cursors'>Install Bluecurve cursors</flag>
+<flag name='gdm'>Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag>
+<flag name='icons'>Install Bluecurve icons</flag>
+<flag name='kdm'>Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag>
+<flag name='nautilus'>Install Bluecurve <pkg>gnome-base/nautilus</pkg>
icons</flag>
</use>
</pkgmetadata>
1.106 x11-themes/redhat-artwork/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/ChangeLog?rev=1.106&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/ChangeLog?rev=1.106&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/redhat-artwork/ChangeLog?r1=1.105&r2=1.106
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ChangeLog 26 Dec 2013 18:51:41 -0000 1.105
+++ ChangeLog 1 Jul 2014 23:16:57 -0000 1.106
@@ -1,6 +1,12 @@
# ChangeLog for x11-themes/redhat-artwork
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.105
2013/12/26 18:51:41 creffett Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.106
2014/07/01 23:16:57 jer Exp $
+
+ 01 Jul 2014; Jeroen Roovers <[email protected]> redhat-artwork-5.0.8-r4.ebuild,
+ metadata.xml:
+ 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.
26 Dec 2013; Chris Reffett <[email protected]>
redhat-artwork-5.0.8-r4.ebuild:
