[gentoo-dev] last rites: dev-java/jnlp-bin, app-misc/openjnlp, dev-java/netx

2011-10-19 Thread Miroslav Šulc (fordfrog)
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

all packages are related to following bug:
https://bugs.gentoo.org/show_bug.cgi?id=377967

jnlp-bin has been replaced by jnlp-api.
openjnlp is obsolete and not needed anymore, also depends on jnlp-bin.
netx was a package that we tried to fix the issue, but in the end it
was replaced with jnlp-api.

Miroslav Šulc (fordfrog)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6ez0YACgkQB6q7Q15RwyCV6QCcCFCIolHppVui86eppp6UhDj9
c98Ani7j71kaFCYoIlHOGIIwLAR/pwOB
=NxW3
-END PGP SIGNATURE-



[gentoo-dev] huse: new helper for low level eclass writers

2011-10-19 Thread Mike Frysinger
i wrote a new func for toolchain.eclass: huse.  this is because the 
toolchain.eclass supports multiple versions in parallel, and the IUSE value 
can vary greatly between them.  so doing `use foo` without checking IUSE first 
doesn't work.  since i got a request to use this in other eclasses (for the 
same reason), i figured i'd move it to eutils.eclass so more people can benefit.

now that we have in_iuse in eutils.eclass (with all the caveats), i'll be 
adding huse:
huse() {
in_iuse $1 || return 1
use $1
}

any comments before i publish ?
-mike


signature.asc
Description: This is a digitally signed message part.


Re: [gentoo-dev] huse: new helper for low level eclass writers

2011-10-19 Thread Mike Frysinger
On Wednesday 19 October 2011 14:05:50 Mike Frysinger wrote:
 now that we have in_iuse in eutils.eclass (with all the caveats), i'll be
 adding huse:
   huse() {
   in_iuse $1 || return 1
   use $1
   }

actually, after posting this, iuse is probably a better name.  huse came 
up because the code constructs i was using before was like:
has foo ${IUSE}  use foo  .
which collapses into:
h[as foo ${IUSE}  ]use foo  ...
huse foo  ...

so new proposal for those who love 1 liners:
iuse() { in_iuse $1  use $1 || return 1 ; }
-mike


signature.asc
Description: This is a digitally signed message part.


Re: [gentoo-dev] huse: new helper for low level eclass writers

2011-10-19 Thread Brian Harring
On Wed, Oct 19, 2011 at 02:05:50PM -0400, Mike Frysinger wrote:
 i wrote a new func for toolchain.eclass: huse.  this is because the 
 toolchain.eclass supports multiple versions in parallel, and the IUSE value 
 can vary greatly between them.  so doing `use foo` without checking IUSE 
 first 
 doesn't work.  since i got a request to use this in other eclasses (for the 
 same reason), i figured i'd move it to eutils.eclass so more people can 
 benefit.
 
 now that we have in_iuse in eutils.eclass (with all the caveats), i'll be 
 adding huse:
   huse() {
   in_iuse $1 || return 1
   use $1
   }
 
 any comments before i publish ?

Call it safe_use.
~brian



Re: [gentoo-dev] huse: new helper for low level eclass writers

2011-10-19 Thread Mike Frysinger
On Wednesday 19 October 2011 14:53:07 Brian Harring wrote:
 On Wed, Oct 19, 2011 at 02:05:50PM -0400, Mike Frysinger wrote:
  i wrote a new func for toolchain.eclass: huse.  this is because the
  toolchain.eclass supports multiple versions in parallel, and the IUSE
  value can vary greatly between them.  so doing `use foo` without
  checking IUSE first doesn't work.  since i got a request to use this in
  other eclasses (for the same reason), i figured i'd move it to
  eutils.eclass so more people can benefit.
  
  now that we have in_iuse in eutils.eclass (with all the caveats), i'll
  be
  
  adding huse:
  huse() {
  
  in_iuse $1 || return 1
  use $1
  
  }
  
  any comments before i publish ?
 
 Call it safe_use.

safe for who ?  that implies to me much more vagueness than iuse ...
-mike


signature.asc
Description: This is a digitally signed message part.


Re: [gentoo-dev] huse: new helper for low level eclass writers

2011-10-19 Thread Brian Harring
On Wed, Oct 19, 2011 at 03:26:21PM -0400, Mike Frysinger wrote:
 On Wednesday 19 October 2011 14:53:07 Brian Harring wrote:
  On Wed, Oct 19, 2011 at 02:05:50PM -0400, Mike Frysinger wrote:
   i wrote a new func for toolchain.eclass: huse.  this is because the
   toolchain.eclass supports multiple versions in parallel, and the IUSE
   value can vary greatly between them.  so doing `use foo` without
   checking IUSE first doesn't work.  since i got a request to use this in
   other eclasses (for the same reason), i figured i'd move it to
   eutils.eclass so more people can benefit.
   
   now that we have in_iuse in eutils.eclass (with all the caveats), i'll
   be
   
   adding huse:
 huse() {
 
 in_iuse $1 || return 1
 use $1
 
 }
   
   any comments before i publish ?
  
  Call it safe_use.
 
 safe for who ?  that implies to me much more vagueness than iuse ...

Safe in the sense it does basic IUSE checks prior, so it doesn't 
trigger QA warnings for when the ebuild doesn't support the flag.

Name's a bit off though considering if the host was amd64, `huse amd64`
would return 1 since it's not in IUSE.

Either way, the 'iuse' naming rather sucks imo; that implies the 
equivalent of `use` (is this flag in iuse?) rather than is this flag 
in iuse and use.

If you're primarily doing this to bypass the QA warnings, than jam 
safe into the name, and/or while making sure the docs are clear about 
it.

Either way, go nuts- rather not get into a bikeshedding discussion on 
this one. ;)
~harring



Re: [gentoo-dev] huse: new helper for low level eclass writers

2011-10-19 Thread Michał Górny
On Wed, 19 Oct 2011 11:53:07 -0700
Brian Harring ferri...@gmail.com wrote:

 On Wed, Oct 19, 2011 at 02:05:50PM -0400, Mike Frysinger wrote:
  i wrote a new func for toolchain.eclass: huse.  this is because the 
  toolchain.eclass supports multiple versions in parallel, and the
  IUSE value can vary greatly between them.  so doing `use foo`
  without checking IUSE first doesn't work.  since i got a request to
  use this in other eclasses (for the same reason), i figured i'd
  move it to eutils.eclass so more people can benefit.
  
  now that we have in_iuse in eutils.eclass (with all the caveats),
  i'll be adding huse:
  huse() {
  in_iuse $1 || return 1
  use $1
  }
  
  any comments before i publish ?
 
 Call it safe_use.

Maybe something off 'default' instead? It could be made a little like
USE defaults, falling back to the default value when USE isn't declared.

-- 
Best regards,
Michał Górny


signature.asc
Description: PGP signature


[gentoo-dev] dev-python/pygobject slotting

2011-10-19 Thread Alexandre Rostovtsev
dev-python/pygobject:3 has been added to gx86 (package.masked for
now). It provides only gobject-introspection based bindings (from
gi.repository import GLib). Per upstream decision, pygobject:2,
starting with 2.28.6-r50, will install only classic bindings
(import glib), since its old gi module heavily collides with
pygobject:3. To make the transition a bit easier for users who are
doing their own python development, the introspection USE flag on
pygobject-2.28.6-r50 pulls in pygobject-3 for the new gi module (in
lieu of installing pygobject-2's internal gi).

See http://www.daa.com.au/pipermail/pygtk/2011-August/019920.html for
an introduction to pygobject:3 porting.

Many existing ebuilds will need to have their pygobject dependency
slotted appropriately. I can take care of adding a slot to the
dependency list myself, but wanted to give a heads up in advance.

The following packages will need to depend on pygobject:2 :
app-admin/system-config-printer-common
app-backup/backintime
app-cdr/gcdemu
app-i18n/ibus
app-i18n/libtomoe-gtk
app-office/gtg
app-pda/synce-sync-engine
app-portage/pms-test-suite
dev-libs/keybinder
dev-python/bpython
dev-python/dbus-python
dev-python/gst-python
dev-python/papyon
dev-python/pyclutter
dev-python/pyclutter-gst
dev-python/pygtk
dev-python/pynotifier
dev-python/python-gudev
dev-python/pyudev
dev-python/pywebkitgtk
dev-util/dissy
dev-util/xesam-tools
dev-vcs/rabbitvcs
games-board/pychess
gnome-extra/gdesklets-core
gnome-extra/gnome-dvb-daemon
media-gfx/gnome-specimen
media-libs/gst-rtsp-server
media-libs/libgpod
media-radio/radiotray
media-sound/exaile
media-sound/soundconverter
net-firewall/ufw-frontends
net-libs/gupnp-igd
net-libs/telepathy-farsight
net-misc/blogtk
net-misc/cnetworkmanager
net-misc/neatx
net-misc/ups-monitor
net-misc/wicd
net-p2p/deluge
net-print/hplip
net-wireless/blueman
sys-auth/pam_usb
sys-fs/udiskie
www-client/uzbl
x11-misc/zim

The following gnome-3.0-era packages make use of a probably
incompatible mixture of classic and introspection bindings, so
gnome-3.2-era versions (that use introspection only) will need to be
moved to portage from the gnome overlay:
app-editors/gedit-3.0.6
app-editors/gedit-plugins-3.0.7
dev-libs/libpeas-1.0.0
media-sound/rhythmbox-2.90.1_pre20111001
media-video/totem-3.0.1

-Alexandre Rostovtsev



Re: [gentoo-dev] huse: new helper for low level eclass writers

2011-10-19 Thread Mike Frysinger
On Wednesday 19 October 2011 15:40:50 Brian Harring wrote:
 Name's a bit off though considering if the host was amd64, `huse amd64`
 would return 1 since it's not in IUSE.

good point.  how about iuse_use ?  or use_iuse ?
-mike


signature.asc
Description: This is a digitally signed message part.


[gentoo-portage-dev] [PATCH 3 of 3] repoman: update copyright on modified files

2011-10-19 Thread Fabian Groffen
To retain the behaviour of echangelog, update the copyrights on modified
files (mostly ebuilds) when necessary.  We also use this to update the
ChangeLog's copyright.

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -523,9 +523,84 @@
 
return outvcs
 
+def update_copyrights(pkgdir, files, year, pretend):
+   
+   Check list of files for Copyright statements, and update them to
+   year.  The patterns used for replacing copyrights are taken from
+   echangelog.  Only the first lines of each file that start with a
+   hash ('#') are considered, until a line is found that doesn't start
+   with a hash.
+   patches and diffs (identified by .patch and .diff) are excluded
+   
+
+   for fn in files:
+   if fn.endswith('.diff') or fn.endswith('.patch'):
+   continue
+
+   fn_path = os.path.join(pkgdir, fn)
+   try:
+   fn_hdl = io.open(_unicode_encode(fn_path,
+   encoding=_encodings['fs'], errors='strict'),
+   mode='r', encoding=_encodings['repo.content'], 
errors='replace')
+   except EnvironmentError:
+   continue
+
+   orig_header = []
+   new_header = []
+
+   for line in fn_hdl:
+   line_strip = line.strip()
+   orig_header.append(line)
+   if not line_strip or line_strip[:1] != '#':
+   new_header.append(line)
+   break
+
+   # these two regexes are taken from
+   # echangelog update_copyright()
+   line = re.sub(r'^(# Copyright \d+) ',
+   r'\1-%s ' % year, line)
+   line = re.sub(r'^(# Copyright) \d\d\d\d-\d\d\d\d',
+   r'\1 1999-%s' % year, line)
+   new_header.append(line)
+
+   difflines = 0
+   for line in difflib.unified_diff(orig_header, new_header,
+   fromfile=fn_path, tofile=fn_path, n=0):
+   util.writemsg_stdout(line, noiselevel=-1)
+   difflines += 1
+   util.writemsg_stdout(\n, noiselevel=-1)
+
+   # unified diff has three lines to start with
+   if difflines  3 and not pretend:
+   # write new file with changed header
+   f, fnnew_path = mkstemp()
+   f = io.open(f, mode='w', 
encoding=_encodings['repo.content'],
+   errors='backslashreplace')
+   for line in new_header:
+   f.write(line);
+   for line in fn_hdl:
+   f.write(line)
+   f.close()
+   try:
+   fn_stat = os.stat(fn_path)
+   except OSError:
+   fn_stat = None
+
+   shutil.move(fnnew_path, fn_path)
+
+   if fn_stat is None:
+   util.apply_permissions(fn_path, mode=0o644)
+   else:
+   util.apply_stat_permissions(fn_path, fn_stat)
+   fn_hdl.close()
+
 def UpdateChangeLog(pkgdir, category, package, new, removed, changed, \
msg, pretend, repodir):
-Write an entry to an existing ChangeLog, or create a new one. 
+   
+   Write an entry to an existing ChangeLog, or create a new one.
+   Updates copyright year on changed files, and updates the header of
+   ChangeLog with the contents of skel.ChangeLog.
+   
 
# figure out who to write as
if 'GENTOO_COMMITTER_NAME' in os.environ and \
@@ -548,6 +623,12 @@
logging.critical(err)
return None
 
+   year = time.strftime('%Y')
+   date = time.strftime('%d %b %Y')
+
+   # check modified files and the ChangeLog for copyright updates
+   update_copyrights(pkgdir, new + changed + ['ChangeLog'], year, pretend)
+
cl_path = os.path.join(pkgdir, 'ChangeLog')
clold_lines = []
clnew_lines = []
@@ -578,7 +659,8 @@
# construct correct header first
try:
if clold_file is not None:
-   # retain header from old ChangeLog
+   # retain header from old ChangeLog, its copyright has
+   # already been updated by update_copyrights
for line in clold_file:
line_strip = line.strip()
clold_lines.append(line)
@@ -597,7 +679,7 @@
line = 

[gentoo-portage-dev] [PATCH 0 of 3] repoman changelog patches

2011-10-19 Thread Fabian Groffen
The following three patches change repoman's echangelog feature
slightly:

1) default for updating the changelog is retrieved from layout.conf
2) skel.ChangeLog is used for constructing the header of new ChangeLogs
3) modified files are checked for copyright years to be updated

Please review before I push them.



Re: [gentoo-portage-dev] [PATCH 2 of 3] repoman: get ChangeLog header from skel.ChangeLog

2011-10-19 Thread Zac Medico
On 10/19/2011 12:55 PM, Fabian Groffen wrote:
 + if clold_lines[-1].strip():
 + f.write(clold_lines[-1])

If the old ChangeLog happens to be an empty file, then clold_lines[-1]
will raise IndexError. So, this is safer:

   if clold_lines and clold_lines[-1].strip():

-- 
Thanks,
Zac