Version bump to 5.31. Use patch to respect ldflags

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 310 insertions, 2 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index a2c5cc357861..d2194fda5adb 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xlockmore
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.82 2010/02/14 15:43:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.83 2010/06/29 19:34:49 hwoarang Exp $
+
+*xlockmore-5.31 (29 Jun 2010)
+
+  29 Jun 2010; Markos Chandras <hwoarang@gentoo.org> +xlockmore-5.31.ebuild,
+  +files/xlockmore-5.31-configure.in.patch,
+  +files/xlockmore-5.31-ldflags.patch:
+  Version bump to 5.31. Use patch to respect ldflags
 
   14 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   xlockmore-5.29.1.ebuild, +files/xlockmore-5.29.1-configure.in.patch:
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 061c28d5b923..5e9928f4b226 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,7 +1,11 @@
 AUX xlockmore-5.29.1-configure.in.patch 616 RMD160 a28f4ef8f0e28b9c84d88a2741cf6e2977fa45c1 SHA1 7ea276d4351d3501809f55c8a594725e0919b187 SHA256 1b2c998022c92b087bd58a2e9340277dd38678509c8432ab503e6ccc2a47daae
+AUX xlockmore-5.31-configure.in.patch 725 RMD160 0d7d56bb260dd203e764da725fa4866d16a6b248 SHA1 d655aaac770a1972355f2e1a8182e8799c62c334 SHA256 e915682b795d77ed4827df8e9b5f322f8bd19a1fe9ef0c18830c98b746bb4e9f
+AUX xlockmore-5.31-ldflags.patch 6398 RMD160 ad393c2eb337f41fabba043252d75545cba56eb0 SHA1 f89da226977fb3faf6aada01c6262503edadf380 SHA256 22b18ad9120875ac7c3af4b81d0f863488b33aec36a50a036e2e7688699bd0cf
 DIST xlockmore-5.28.tar.bz2 1901583 RMD160 f75f2dea6fa747c4299a8c7c5ee9462f238f5e0b SHA1 a6fd4786d678a090c454a9993c8880a03160634f SHA256 9483efc940705f5fff8555eeeba6f3514ffee40a1b4222bdb7d8329759fd3fd7
 DIST xlockmore-5.29.1.tar.bz2 1938941 RMD160 8ade29e088de990c4dffcaa721fe4cc359c201c2 SHA1 c6d0380a54e403dce4dfe6570d7c9d11363d2eea SHA256 acda214225e86b7c6cbb43d8baf60f9cb56cfb32bbaeb1d095f95e17b43fe183
+DIST xlockmore-5.31.tar.bz2 1973498 RMD160 17f5e71f395aac1e9a99b438904b87943fb1cc15 SHA1 41b9fddb8fded906283c3b91c04e5586fc26af75 SHA256 4cd777a8b81840900fed4354af6d140b8555966aef31825508272802e4866b85
 EBUILD xlockmore-5.28.ebuild 2110 RMD160 2cc6aabb5682e669c1dcb02b2058cb12dd675210 SHA1 ab86e7b07467cef276321c84e69ef0f28c6442ec SHA256 e3a9c5091e391f96b36cae12b72ba5a8642308f424ba5c576f05166935e37ea5
 EBUILD xlockmore-5.29.1.ebuild 2214 RMD160 7dbedf26fdb1fa15855fac35dd58937736545bb1 SHA1 f76fc06023964cb913e71ee23f2d2e821a399668 SHA256 9bf24f7b21cd205f6f95fb7c8cabf4ca29bb2cea3c9975e47748c6e31de28005
-MISC ChangeLog 12709 RMD160 46fba98e163ebbcfef46ba1cddb4a0a490710f5c SHA1 d5319cc104dc3ef4e8deb9ade6ba61278603f040 SHA256 66e8dd22ee0e28ac24b723171505790fdd8834a84af01e7b7db600ab7ee20ab8
+EBUILD xlockmore-5.31.ebuild 2254 RMD160 1e8a099485ccb6230017e1dc0da6d43c019f27e2 SHA1 ded14a8e85444f204a8e0cbde77005e9c3371c2e SHA256 f577eab41af8c7e66d634bc5b858bd2af2514e34d8de6233f45682709742c63c
+MISC ChangeLog 12953 RMD160 f8e3e23e0da157d7f71b3fab4ac79d29f7a77a55 SHA1 2dd4da293f74d2164a8c378f5eae569bbe258e29 SHA256 8759d40095d1b717c4696a20e965847c97e04c2e103ea8813ee47b8613a40906
 MISC metadata.xml 255 RMD160 c753cd3fbccd65b2fe478946948a5dd6afef371a SHA1 744a7bf93879f458df34c7bf8483f34f92e76782 SHA256 23193825c01ae6c6d66fd3604398bc108f0d263706c1842600f1ce6718128a4b
diff --git a/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch b/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch
new file mode 100644
index 000000000000..a0b8f6d3e5b2
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch
@@ -0,0 +1,22 @@
+Index: xlockmore-5.31/configure.in
+===================================================================
+--- xlockmore-5.31.orig/configure.in
++++ xlockmore-5.31/configure.in
+@@ -8,17 +8,7 @@ AC_CANONICAL_HOST
+ canonical=$host
+ 
+ AC_PROG_CC
+-dnl Check if C++ compiler is present. If not set CXX to the C-compiler used
+-dnl for the other compilations.
+-if test "$CC" = gcc; then
+-  AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc)
+-else
+-  AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc)
+-fi
+ AC_PROG_CXX
+-if test "${CXX}" = "xlC" ; then
+-  CXXFLAGS="${CXXFLAGS} -+"
+-fi
+ 
+ dnl If you're using g++-2.95 or later and have old X11 includes, you may need
+ dnl to use "g++ -fpermissive" in the Makefiles
diff --git a/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch b/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch
new file mode 100644
index 000000000000..85ca2fe259d6
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch
@@ -0,0 +1,185 @@
+Index: xlockmore-5.31/modes/Makefile.in
+===================================================================
+--- xlockmore-5.31.orig/modes/Makefile.in
++++ xlockmore-5.31/modes/Makefile.in
+@@ -329,6 +329,7 @@ DEFS = @DEFS@ $(DEFINES)
+ XLOCKINC = -I. -I.. -I$(top_srcdir) -I$(UTILDIR) -I../.. @XLOCKINC@
+ CFLAGS = @CFLAGS@
+ CXXFLAGS = @CXXFLAGS@
++LDFLAGS = @LDFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+ XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
+@@ -367,7 +368,7 @@ PURIFY = @PURIFY@
+ 
+ @MODULES@$(NORMMODULES) : %.xlk:%.o
+ @MODULES@	$(RM) $@
+-@MODULES@	$(CXX) $(CXXFLAGS) -shared -o $@ $<
++@MODULES@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $<
+ 
+ $(DOG)fire.xlk : $(DOG)xpm-ximage.o
+ $(DOG)lament.xlk : $(DOG)xpm-ximage.o
+@@ -375,60 +376,60 @@ $(DOG)sballs.xlk : $(DOG)xpm-ximage.o
+ 
+ @MODULES@@GL@$(DOG)fire.xlk $(DOG)lament.xlk $(DOG)sballs.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $<
+ 
+ $(DOG)pipes.xlk : $(DOG)buildlwo.o $(DOG)pipeobjs.o
+ 
+ @MODULES@@GL@$(DOG)pipes.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $<
+ 
+ $(DOG)sproingies.xlk : $(SPROINGIESOBJS)
+ 
+ @MODULES@@GL@$(DOG)sproingies.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(SPROINGIESOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(SPROINGIESOBJS) $<
+ 
+ $(DOG)atlantis.xlk : $(ATLANTISOBJS)
+ 
+ @MODULES@@GL@$(DOG)atlantis.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(ATLANTISOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(ATLANTISOBJS) $<
+ 
+ $(DOG)bubble3d.xlk : $(BUBBLE3DOBJS)
+ 
+ @MODULES@@GL@$(DOG)bubble3d.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $<
+ 
+ $(DOG)glplanet.xlk : $(GLPLANETOBJS)
+ 
+ @MODULES@@GL@$(DOG)glplanet.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(GLPLANETOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(GLPLANETOBJS) $<
+ 
+ $(DOG)molecul.xlk : $(MOLECULEOBJS)
+ 
+ @MODULES@@GL@$(DOG)molecule.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(MOLECULEOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(MOLECULEOBJS) $<
+ 
+ $(DOG)juggler3d.xlk : $(JUGGLER3DOBJS)
+ 
+ @MODULES@@GL@$(DOG)juggler3d.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $<
+ 
+ $(DOG)invert.xlk : $(INVERTOBJS)
+ 
+ @MODULES@@CCC@@GL@$(DOG)invert.xlk : %.xlk:%.o
+ @MODULES@@CCC@@GL@	$(RM) $@
+-@MODULES@@CCC@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(INVERTOBJS) $<
++@MODULES@@CCC@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(INVERTOBJS) $<
+ 
+ xlock : $(UTILOBJDIR)xlock
+ 
+ $(UTILOBJDIR)xlock : $(XLOCKOBJS)
+-	$(PURIFY) $(CXX) $(CXXFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS)
++	$(PURIFY) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS)
+ 	@ $(ECHO) "$@ BUILD COMPLETE"
+ 	@ $(ECHO) ""
+ 
+@@ -587,10 +588,10 @@ $(GLOBJDIR)tunnel_draw.o : $(GLDIR)tunne
+ .SUFFIXES : $(C) $(CX) $(O) $(M)
+ 
+ $(C)$(O) :
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
+ 
+ $(CX)$(O) :
+-	$(CXX) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $<
++	$(CXX) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $<
+ 
+ install : install-program install-man install-ad
+ 	@ $(ECHO) "$@ COMPLETE"
+Index: xlockmore-5.31/xglock/Makefile.in
+===================================================================
+--- xlockmore-5.31.orig/xglock/Makefile.in
++++ xlockmore-5.31/xglock/Makefile.in
+@@ -90,6 +90,7 @@ ECHO = echo
+ DEFS = @DEFS@ $(DEFINES) -DXGLOCKRC_FILE=\"$(datadir)/xlock/xglockrc\"
+ XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_srcdir)
+ CFLAGS = @GTK_CFLAGS@ @CFLAGS@
++LDFLAGS= @LDFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+ XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
+@@ -101,14 +102,14 @@ XGLOCKLIBS = @XGLOCKLIBS@
+ PURIFY = @PURIFY@
+ 
+ xglock : $(XGLOCKOBJS)
+-	$(PURIFY) $(CC) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS)
++	$(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS)
+ 	@ $(ECHO) "$@ BUILD COMPLETE"
+ 	@ $(ECHO) ""
+ 
+ .SUFFIXES : $(C) $(O)
+ 
+ $(C)$(O) :
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $<
+ 
+ install : @INSTALL_XGLOCK@
+ 
+Index: xlockmore-5.31/xlock/Makefile.in
+===================================================================
+--- xlockmore-5.31.orig/xlock/Makefile.in
++++ xlockmore-5.31/xlock/Makefile.in
+@@ -118,6 +118,7 @@ XLOCKINC = -I. -I.. -I$(top_srcdir) @XLO
+ CFLAGS = @CFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
++LDFLAGS = @LDFLAGS@
+ 
+ #If you have purify, and want to use it, uncomment this definition or
+ # run the make as `make PURIFY=purify'
+@@ -127,7 +128,7 @@ PURIFY = @PURIFY@
+ .SUFFIXES : $(C) $(O)
+ 
+ $(C)$(O) :
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
+ 
+ install :
+ 
+Index: xlockmore-5.31/xmlock/Makefile.in
+===================================================================
+--- xlockmore-5.31.orig/xmlock/Makefile.in
++++ xlockmore-5.31/xmlock/Makefile.in
+@@ -92,6 +92,8 @@ ECHO = echo
+ DEFS = @DEFS@ $(DEFINES)
+ XMLOCKINC = @XMLOCKINC@ -I.. -I$(top_srcdir)
+ CFLAGS = @CFLAGS@
++LDFLAGS= @LDFLAGS@
++
+ #CFLAGS = -O
+ #CFLAGS = -g
+ XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
+@@ -103,14 +105,14 @@ XMLOCKLIBS = @XMLOCKLIBS@
+ PURIFY = @PURIFY@
+ 
+ xmlock : $(XMLOCKOBJS)
+-	$(PURIFY) $(CC) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS)
++	$(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS)
+ 	@ $(ECHO) "$@ BUILD COMPLETE"
+ 	@ $(ECHO) ""
+ 
+ .SUFFIXES : $(C) $(O)
+ 
+ $(C)$(O) :
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $<
+ 
+ install : @INSTALL_XMLOCK@
+ 
diff --git a/x11-misc/xlockmore/xlockmore-5.31.ebuild b/x11-misc/xlockmore/xlockmore-5.31.ebuild
new file mode 100644
index 000000000000..a40d2f38c373
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.31.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.31.ebuild,v 1.1 2010/06/29 19:34:49 hwoarang Exp $
+
+EAPI=2
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
+SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug esd gtk motif nas opengl pam truetype xinerama xlockrc X"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXmu
+	opengl? ( media-libs/mesa
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) )
+	truetype? ( media-libs/freetype:2 )
+	pam? ( virtual/pam )
+	nas? ( media-libs/nas )
+	esd? ( media-sound/esound )
+	motif? ( x11-libs/openmotif )
+	gtk? ( x11-libs/gtk+:2 )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xineramaproto"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.in.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use opengl && use truetype; then
+			myconf="${myconf} --with-ftgl"
+			append-flags -DFTGL213
+		else
+			myconf="${myconf} --without-ftgl"
+	fi
+
+	econf \
+		--enable-vtlock \
+		--enable-syslog \
+		$(use_enable xlockrc) \
+		$(use_enable pam) \
+		--disable-use-mb \
+		--enable-appdefaultdir=/usr/share/X11/app-defaults \
+		$(use_with motif) \
+		$(use_with debug editres) \
+		$(use_with truetype ttf) \
+		$(use_with truetype freetype) \
+		$(use_with opengl) \
+		$(use_with opengl mesa) \
+		$(use_with xinerama) \
+		$(use_with esd esound) \
+		$(use_with nas) \
+		$(use_with crypt) \
+		$(use_with gtk gtk2) \
+		--without-gtk \
+		${myconf}
+}
+
+src_install() {
+	einstall xapploaddir="${D}/usr/share/X11/app-defaults" \
+		mandir="${D}/usr/share/man/man1" INSTPGMFLAGS="" \
+		|| die "einstall failed"
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	dohtml docs/xlock.html
+	dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
+}