added smarter version handing, hence bumping version number. fix libtool problems (#74729)

4 files changed, 206 insertions, 6 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index ab4088255ce4..af443d52df83 100644
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/redhat-artwork
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.42 2004/12/04 16:32:27 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.43 2004/12/20 18:24:37 liquidx Exp $
+
+*redhat-artwork-0.120.1.2 (20 Dec 2004)
+
+  20 Dec 2004; Alastair Tse <liquidx@gentoo.org>
+  +redhat-artwork-0.120.1.2.ebuild:
+  added smarter version handing, hence bumping version number. fix libtool
+  problems (#74729)
 
 *redhat-artwork-0.120 (04 Dec 2004)
 
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index 60b42572f173..042b48ccf169 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -1,12 +1,14 @@
 MD5 4c963a31ca52e7d59989b2c0813db9f4 ChangeLog 6263
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 09aa7f24e5d7a4262aa87a51d1d4a6dc redhat-artwork-0.120.ebuild 5303
 MD5 efd29c3934b6fbdb6a551b862a623bd3 redhat-artwork-0.73.ebuild 5220
-MD5 befd73f22745041af1b47aeaabcb2c8d redhat-artwork-0.96.ebuild 5277
 MD5 a7822d51918f2b3c1a3f434adc9b650f redhat-artwork-0.95.ebuild 5102
-MD5 85bf44a0b4be21be168fb786434bc5aa files/digest-redhat-artwork-0.120 78
+MD5 276fa7f0709dd9aa403d83e4218c8c70 redhat-artwork-0.120.1.2.ebuild 5397
+MD5 befd73f22745041af1b47aeaabcb2c8d redhat-artwork-0.96.ebuild 5277
+MD5 09aa7f24e5d7a4262aa87a51d1d4a6dc redhat-artwork-0.120.ebuild 5303
 MD5 927835d1878c71d197a09b5ec12f145d files/digest-redhat-artwork-0.73 75
+MD5 17e6ab0b628ed039eb471b3dba20157a files/digest-redhat-artwork-0.95 75
+MD5 bd1e13df0214635279d65b8c6c245759 files/digest-redhat-artwork-0.96 75
 MD5 dd889dbdcebae49dc59d0d60dff259de files/redhat-artwork-0.63-cursors.patch 1071
 MD5 9912a3c64a0b848f2ccf2673f2b3093d files/redhat-artwork-0.63-gcc2.patch 483
-MD5 bd1e13df0214635279d65b8c6c245759 files/digest-redhat-artwork-0.96 75
-MD5 17e6ab0b628ed039eb471b3dba20157a files/digest-redhat-artwork-0.95 75
+MD5 85bf44a0b4be21be168fb786434bc5aa files/digest-redhat-artwork-0.120.1.2 78
+MD5 85bf44a0b4be21be168fb786434bc5aa files/digest-redhat-artwork-0.120 78
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.120.1.2 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.120.1.2
new file mode 100644
index 000000000000..7bd807bf62e0
--- /dev/null
+++ b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.120.1.2
@@ -0,0 +1 @@
+MD5 9fbbbe90358a3404bce8fc4b6f9261c3 redhat-artwork-0.120-1.2.src.rpm 7694388
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.120.1.2.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.120.1.2.ebuild
new file mode 100644
index 000000000000..132d3ba5ff7d
--- /dev/null
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.120.1.2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.120.1.2.ebuild,v 1.1 2004/12/20 18:24:37 liquidx Exp $
+
+inherit eutils rpm libtool versionator
+
+MY_PV=$(replace_version_separator 2 '-')
+DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus"
+HOMEPAGE="http://www.redhat.com"
+SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${PN}-${MY_PV}.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+IUSE="kde gtk xmms gtk2"
+
+# Needed to build...
+DEPEND=">=sys-devel/autoconf-2.58
+	sys-devel/automake
+	media-gfx/icon-slicer
+	>=x11-libs/gtk+-2.0
+	gtk? (  >=media-libs/gdk-pixbuf-0.2.5
+			=x11-libs/gtk+-1.2* )
+	kde? (	>=x11-libs/qt-3.0.5
+		>=kde-base/kdebase-3.0.2 )
+	gtk2? ( >=x11-libs/gtk+-2* )
+	dev-util/intltool
+	media-gfx/icon-slicer"
+# Because one may only want to use the theme with kde OR gtk OR Metacity
+# OR gdm, we don't want either as run-time dependencies...
+RDEPEND="virtual/x11"
+
+MY_SV=$(get_version_component_range 1-2)
+S=${WORKDIR}/${PN}-${MY_SV}
+
+# We need to change some RedHat-specific stuff to Gentoo-style...
+_replace() {
+	FROM=$1
+	TO=$2
+
+	for FILE in $(fgrep -r -l "${FROM}" *); do
+		echo -n Changing \"${FROM}\" to \"${TO}\" in ${FILE}...
+		sed "s:${FROM}:${TO}:g" < "${FILE}" > "${FILE}.$$"
+		mv "${FILE}.$$" "${FILE}"
+		echo Done.
+	done
+}
+
+src_compile() {
+
+	use kde && addwrite "${QTDIR}/etc/settings"
+
+	export WANT_AUTOCONF=2.5
+	# dies is LANG has UTF-8
+	export LANG=C
+	export LC_ALL=C
+
+	use kde || (
+
+	rm configure
+	mv configure.in configure.in.old
+	sed -e	"s|dnl KDE_USE_QT||" \
+		-e "s|KDE_||g" \
+		-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.old > configure.in
+
+	mv art/Makefile.am art/Makefile.am.old
+	sed -e 	"s|kde||" \
+		-e	"s|qt||" \
+			art/Makefile.am.old > art/Makefile.am
+
+	mv art/Makefile.in art/Makefile.in.old
+	sed -e  "s|kde||" \
+		-e  "s|qt||" \
+			art/Makefile.in.old > art/Makefile.in
+
+	)
+
+	# disable gtk 1.x support if gtk use keyword is not set
+	use gtk || (
+
+	rm configure
+	mv configure.in configure.in.old
+	sed -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.old > configure.in
+
+	mv art/gtk/Makefile.am art/gtk/Makefile.am.old
+	sed -e  "s|Bluecurve1||" \
+	art/gtk/Makefile.am.old > art/gtk/Makefile.am
+
+	)
+
+	if ! use kde || ! use gtk ; then
+		aclocal 
+		libtoolize --copy --force
+		autoconf && automake --add-missing || die "auto* failed"
+	fi
+
+	# paths have to be fixed for kde
+	use kde && (
+
+	# Fix paths...
+	_replace "/usr/lib/qt3"          "${QTDIR}"
+	_replace '${libdir}/qt3'         "${QTDIR}"
+	_replace '$(libdir)/qt3'         "${QTDIR}"
+	_replace "/usr/lib/kde3"         "${KDEDIR}/lib"
+	_replace '${libdir}/kde3'        "${KDEDIR}/lib"
+	_replace "/usr/lib/kwin.la"      "${KDEDIR}/lib/kwin.la"
+	chmod +x configure
+
+	)
+
+	# fix iconrc
+	#mv art/gtk/make-iconrc.pl art/gtk/make-iconrc.pl.broken
+	#sed 's|$ARGV\[3\]|\"/usr/share/icons/Bluecurve\"|' \
+	#	art/gtk/make-iconrc.pl.broken >  art/gtk/make-iconrc.pl
+	#chmod +x art/gtk/make-iconrc.pl
+
+	./configure || die
+	emake || die
+}
+
+src_install () {
+	# dies is LANG has UTF-8
+	export LANG=C
+	export LC_ALL=C
+
+	make prefix=${D}/usr kde_moduledir=${D}/${KDEDIR}/lib \
+	styledir=${D}/${KDEDIR}/lib/kde3/plugins/styles \
+	settingsdir=${D}/${KDEDIR}/etc/settings install || die
+
+	use kde && (
+		dodir ${KDEDIR}/share/apps
+		mv ${D}/usr/share/apps/* ${D}/${KDEDIR}/share/apps
+		rmdir ${D}/usr/share/apps
+
+		dodir ${KDEDIR}/share/icons
+		dosym /usr/share/icons/Bluecurve ${KDEDIR}/share/icons/Bluecurve
+	)
+
+	use kde || (
+		rm -rf ${D}/usr/share/apps
+	)
+
+	# 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/
+
+	# replace redhat logo with gnome logo from happygnome theme
+	sed -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 > Bluecurve.xml.mod || die
+
+	mv Bluecurve.xml.mod Bluecurve.xml
+
+	# Bluecurve GDM screenshot has redhat logo
+	# Theme copyright notice left intact... do not modify it
+	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
+	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
+
+	# move cursors to /usr/share/cursors/${X11_IMPL}
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+
+	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}
+		dosym /usr/share/cursors/${X11_IMPLEM}/${x}/cursors /usr/share/icons/${x}/cursors
+	done
+
+	# remove xmms skin if unneeded
+	use xmms || rm -rf ${D}/usr/share/xmms
+
+	cd ${S}
+	dodoc AUTHORS NEWS README ChangeLog
+}
+